WhatsApp: compilation fix

1 files changed, 12009 insertions, 9798 deletions

diff --git a/protocols/WhatsAppWeb/src/pmsg.pb.h b/protocols/WhatsAppWeb/src/pmsg.pb.h
index 5e17139e71..cfe8da76fc 100644
--- a/protocols/WhatsAppWeb/src/pmsg.pb.h
+++ b/protocols/WhatsAppWeb/src/pmsg.pb.h
@@ -8,12 +8,12 @@
 #include <string>
 
 #include <google/protobuf/port_def.inc>
-#if PROTOBUF_VERSION < 3018000
+#if PROTOBUF_VERSION < 3021000
 #error This file was generated by a newer version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3018000 < PROTOBUF_MIN_PROTOC_VERSION
+#if 3021004 < PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
 #error incompatible with your Protocol Buffer headers. Please
 #error regenerate this file with a newer version of protoc.
@@ -23,7 +23,6 @@
 #include <google/protobuf/io/coded_stream.h>
 #include <google/protobuf/arena.h>
 #include <google/protobuf/arenastring.h>
-#include <google/protobuf/generated_message_table_driven.h>
 #include <google/protobuf/generated_message_util.h>
 #include <google/protobuf/metadata_lite.h>
 #include <google/protobuf/generated_message_reflection.h>
@@ -43,15 +42,7 @@ PROTOBUF_NAMESPACE_CLOSE
 
 // Internal implementation detail -- do not use these members.
 struct TableStruct_pmsg_2eproto {
-  static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTableField entries[]
-    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
-  static const ::PROTOBUF_NAMESPACE_ID::internal::AuxiliaryParseTableField aux[]
-    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
-  static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTable schema[79]
-    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
-  static const ::PROTOBUF_NAMESPACE_ID::internal::FieldMetadata field_metadata[];
-  static const ::PROTOBUF_NAMESPACE_ID::internal::SerializationTable serialization_table[];
-  static const ::PROTOBUF_NAMESPACE_ID::uint32 offsets[];
+  static const uint32_t offsets[];
 };
 extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_pmsg_2eproto;
 namespace proto {
@@ -1121,7 +1112,7 @@ class PaymentMoney final :
  public:
   inline PaymentMoney() : PaymentMoney(nullptr) {}
   ~PaymentMoney() override;
-  explicit constexpr PaymentMoney(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR PaymentMoney(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   PaymentMoney(const PaymentMoney& from);
   PaymentMoney(PaymentMoney&& from) noexcept
@@ -1178,7 +1169,12 @@ class PaymentMoney final :
   }
   inline void Swap(PaymentMoney* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -1192,34 +1188,34 @@ class PaymentMoney final :
 
   // implements Message ----------------------------------------------
 
-  inline PaymentMoney* New() const final {
-    return new PaymentMoney();
-  }
-
-  PaymentMoney* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  PaymentMoney* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<PaymentMoney>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const PaymentMoney& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const PaymentMoney& from);
+  void MergeFrom( const PaymentMoney& from) {
+    PaymentMoney::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(PaymentMoney* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.PaymentMoney";
@@ -1227,9 +1223,6 @@ class PaymentMoney final :
   protected:
   explicit PaymentMoney(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -1256,7 +1249,7 @@ class PaymentMoney final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_currencycode(ArgT0&& arg0, ArgT... args);
   std::string* mutable_currencycode();
-  PROTOBUF_MUST_USE_RESULT std::string* release_currencycode();
+  PROTOBUF_NODISCARD std::string* release_currencycode();
   void set_allocated_currencycode(std::string* currencycode);
   private:
   const std::string& _internal_currencycode() const;
@@ -1270,11 +1263,11 @@ class PaymentMoney final :
   bool _internal_has_value() const;
   public:
   void clear_value();
-  ::PROTOBUF_NAMESPACE_ID::int64 value() const;
-  void set_value(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t value() const;
+  void set_value(int64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::int64 _internal_value() const;
-  void _internal_set_value(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t _internal_value() const;
+  void _internal_set_value(int64_t value);
   public:
 
   // optional uint32 offset = 2;
@@ -1283,11 +1276,11 @@ class PaymentMoney final :
   bool _internal_has_offset() const;
   public:
   void clear_offset();
-  ::PROTOBUF_NAMESPACE_ID::uint32 offset() const;
-  void set_offset(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t offset() const;
+  void set_offset(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_offset() const;
-  void _internal_set_offset(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_offset() const;
+  void _internal_set_offset(uint32_t value);
   public:
 
   // @@protoc_insertion_point(class_scope:proto.PaymentMoney)
@@ -1297,11 +1290,14 @@ class PaymentMoney final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr currencycode_;
-  ::PROTOBUF_NAMESPACE_ID::int64 value_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 offset_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr currencycode_;
+    int64_t value_;
+    uint32_t offset_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -1311,7 +1307,7 @@ class HydratedQuickReplyButton final :
  public:
   inline HydratedQuickReplyButton() : HydratedQuickReplyButton(nullptr) {}
   ~HydratedQuickReplyButton() override;
-  explicit constexpr HydratedQuickReplyButton(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR HydratedQuickReplyButton(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   HydratedQuickReplyButton(const HydratedQuickReplyButton& from);
   HydratedQuickReplyButton(HydratedQuickReplyButton&& from) noexcept
@@ -1368,7 +1364,12 @@ class HydratedQuickReplyButton final :
   }
   inline void Swap(HydratedQuickReplyButton* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -1382,34 +1383,34 @@ class HydratedQuickReplyButton final :
 
   // implements Message ----------------------------------------------
 
-  inline HydratedQuickReplyButton* New() const final {
-    return new HydratedQuickReplyButton();
-  }
-
-  HydratedQuickReplyButton* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  HydratedQuickReplyButton* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<HydratedQuickReplyButton>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const HydratedQuickReplyButton& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const HydratedQuickReplyButton& from);
+  void MergeFrom( const HydratedQuickReplyButton& from) {
+    HydratedQuickReplyButton::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(HydratedQuickReplyButton* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.HydratedQuickReplyButton";
@@ -1417,9 +1418,6 @@ class HydratedQuickReplyButton final :
   protected:
   explicit HydratedQuickReplyButton(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -1445,7 +1443,7 @@ class HydratedQuickReplyButton final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_displaytext(ArgT0&& arg0, ArgT... args);
   std::string* mutable_displaytext();
-  PROTOBUF_MUST_USE_RESULT std::string* release_displaytext();
+  PROTOBUF_NODISCARD std::string* release_displaytext();
   void set_allocated_displaytext(std::string* displaytext);
   private:
   const std::string& _internal_displaytext() const;
@@ -1463,7 +1461,7 @@ class HydratedQuickReplyButton final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_id(ArgT0&& arg0, ArgT... args);
   std::string* mutable_id();
-  PROTOBUF_MUST_USE_RESULT std::string* release_id();
+  PROTOBUF_NODISCARD std::string* release_id();
   void set_allocated_id(std::string* id);
   private:
   const std::string& _internal_id() const;
@@ -1478,10 +1476,13 @@ class HydratedQuickReplyButton final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr displaytext_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr id_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr displaytext_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr id_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -1491,7 +1492,7 @@ class HydratedURLButton final :
  public:
   inline HydratedURLButton() : HydratedURLButton(nullptr) {}
   ~HydratedURLButton() override;
-  explicit constexpr HydratedURLButton(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR HydratedURLButton(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   HydratedURLButton(const HydratedURLButton& from);
   HydratedURLButton(HydratedURLButton&& from) noexcept
@@ -1548,7 +1549,12 @@ class HydratedURLButton final :
   }
   inline void Swap(HydratedURLButton* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -1562,34 +1568,34 @@ class HydratedURLButton final :
 
   // implements Message ----------------------------------------------
 
-  inline HydratedURLButton* New() const final {
-    return new HydratedURLButton();
-  }
-
-  HydratedURLButton* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  HydratedURLButton* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<HydratedURLButton>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const HydratedURLButton& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const HydratedURLButton& from);
+  void MergeFrom( const HydratedURLButton& from) {
+    HydratedURLButton::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(HydratedURLButton* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.HydratedURLButton";
@@ -1597,9 +1603,6 @@ class HydratedURLButton final :
   protected:
   explicit HydratedURLButton(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -1625,7 +1628,7 @@ class HydratedURLButton final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_displaytext(ArgT0&& arg0, ArgT... args);
   std::string* mutable_displaytext();
-  PROTOBUF_MUST_USE_RESULT std::string* release_displaytext();
+  PROTOBUF_NODISCARD std::string* release_displaytext();
   void set_allocated_displaytext(std::string* displaytext);
   private:
   const std::string& _internal_displaytext() const;
@@ -1643,7 +1646,7 @@ class HydratedURLButton final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_url(ArgT0&& arg0, ArgT... args);
   std::string* mutable_url();
-  PROTOBUF_MUST_USE_RESULT std::string* release_url();
+  PROTOBUF_NODISCARD std::string* release_url();
   void set_allocated_url(std::string* url);
   private:
   const std::string& _internal_url() const;
@@ -1658,10 +1661,13 @@ class HydratedURLButton final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr displaytext_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr url_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr displaytext_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr url_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -1671,7 +1677,7 @@ class HydratedCallButton final :
  public:
   inline HydratedCallButton() : HydratedCallButton(nullptr) {}
   ~HydratedCallButton() override;
-  explicit constexpr HydratedCallButton(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR HydratedCallButton(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   HydratedCallButton(const HydratedCallButton& from);
   HydratedCallButton(HydratedCallButton&& from) noexcept
@@ -1728,7 +1734,12 @@ class HydratedCallButton final :
   }
   inline void Swap(HydratedCallButton* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -1742,34 +1753,34 @@ class HydratedCallButton final :
 
   // implements Message ----------------------------------------------
 
-  inline HydratedCallButton* New() const final {
-    return new HydratedCallButton();
-  }
-
-  HydratedCallButton* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  HydratedCallButton* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<HydratedCallButton>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const HydratedCallButton& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const HydratedCallButton& from);
+  void MergeFrom( const HydratedCallButton& from) {
+    HydratedCallButton::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(HydratedCallButton* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.HydratedCallButton";
@@ -1777,9 +1788,6 @@ class HydratedCallButton final :
   protected:
   explicit HydratedCallButton(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -1805,7 +1813,7 @@ class HydratedCallButton final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_displaytext(ArgT0&& arg0, ArgT... args);
   std::string* mutable_displaytext();
-  PROTOBUF_MUST_USE_RESULT std::string* release_displaytext();
+  PROTOBUF_NODISCARD std::string* release_displaytext();
   void set_allocated_displaytext(std::string* displaytext);
   private:
   const std::string& _internal_displaytext() const;
@@ -1823,7 +1831,7 @@ class HydratedCallButton final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_phonenumber(ArgT0&& arg0, ArgT... args);
   std::string* mutable_phonenumber();
-  PROTOBUF_MUST_USE_RESULT std::string* release_phonenumber();
+  PROTOBUF_NODISCARD std::string* release_phonenumber();
   void set_allocated_phonenumber(std::string* phonenumber);
   private:
   const std::string& _internal_phonenumber() const;
@@ -1838,10 +1846,13 @@ class HydratedCallButton final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr displaytext_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr phonenumber_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr displaytext_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr phonenumber_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -1851,7 +1862,7 @@ class HydratedTemplateButton final :
  public:
   inline HydratedTemplateButton() : HydratedTemplateButton(nullptr) {}
   ~HydratedTemplateButton() override;
-  explicit constexpr HydratedTemplateButton(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR HydratedTemplateButton(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   HydratedTemplateButton(const HydratedTemplateButton& from);
   HydratedTemplateButton(HydratedTemplateButton&& from) noexcept
@@ -1915,7 +1926,12 @@ class HydratedTemplateButton final :
   }
   inline void Swap(HydratedTemplateButton* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -1929,34 +1945,34 @@ class HydratedTemplateButton final :
 
   // implements Message ----------------------------------------------
 
-  inline HydratedTemplateButton* New() const final {
-    return new HydratedTemplateButton();
-  }
-
-  HydratedTemplateButton* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  HydratedTemplateButton* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<HydratedTemplateButton>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const HydratedTemplateButton& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const HydratedTemplateButton& from);
+  void MergeFrom( const HydratedTemplateButton& from) {
+    HydratedTemplateButton::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(HydratedTemplateButton* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.HydratedTemplateButton";
@@ -1964,9 +1980,6 @@ class HydratedTemplateButton final :
   protected:
   explicit HydratedTemplateButton(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -1990,11 +2003,11 @@ class HydratedTemplateButton final :
   bool _internal_has_index() const;
   public:
   void clear_index();
-  ::PROTOBUF_NAMESPACE_ID::uint32 index() const;
-  void set_index(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t index() const;
+  void set_index(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_index() const;
-  void _internal_set_index(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_index() const;
+  void _internal_set_index(uint32_t value);
   public:
 
   // .proto.HydratedQuickReplyButton quickReplyButton = 1;
@@ -2004,7 +2017,7 @@ class HydratedTemplateButton final :
   public:
   void clear_quickreplybutton();
   const ::proto::HydratedQuickReplyButton& quickreplybutton() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::HydratedQuickReplyButton* release_quickreplybutton();
+  PROTOBUF_NODISCARD ::proto::HydratedQuickReplyButton* release_quickreplybutton();
   ::proto::HydratedQuickReplyButton* mutable_quickreplybutton();
   void set_allocated_quickreplybutton(::proto::HydratedQuickReplyButton* quickreplybutton);
   private:
@@ -2022,7 +2035,7 @@ class HydratedTemplateButton final :
   public:
   void clear_urlbutton();
   const ::proto::HydratedURLButton& urlbutton() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::HydratedURLButton* release_urlbutton();
+  PROTOBUF_NODISCARD ::proto::HydratedURLButton* release_urlbutton();
   ::proto::HydratedURLButton* mutable_urlbutton();
   void set_allocated_urlbutton(::proto::HydratedURLButton* urlbutton);
   private:
@@ -2040,7 +2053,7 @@ class HydratedTemplateButton final :
   public:
   void clear_callbutton();
   const ::proto::HydratedCallButton& callbutton() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::HydratedCallButton* release_callbutton();
+  PROTOBUF_NODISCARD ::proto::HydratedCallButton* release_callbutton();
   ::proto::HydratedCallButton* mutable_callbutton();
   void set_allocated_callbutton(::proto::HydratedCallButton* callbutton);
   private:
@@ -2066,18 +2079,21 @@ class HydratedTemplateButton final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 index_;
-  union HydratedButtonUnion {
-    constexpr HydratedButtonUnion() : _constinit_{} {}
-      ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized _constinit_;
-    ::proto::HydratedQuickReplyButton* quickreplybutton_;
-    ::proto::HydratedURLButton* urlbutton_;
-    ::proto::HydratedCallButton* callbutton_;
-  } hydratedButton_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 _oneof_case_[1];
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    uint32_t index_;
+    union HydratedButtonUnion {
+      constexpr HydratedButtonUnion() : _constinit_{} {}
+        ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized _constinit_;
+      ::proto::HydratedQuickReplyButton* quickreplybutton_;
+      ::proto::HydratedURLButton* urlbutton_;
+      ::proto::HydratedCallButton* callbutton_;
+    } hydratedButton_;
+    uint32_t _oneof_case_[1];
 
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -2087,7 +2103,7 @@ class QuickReplyButton final :
  public:
   inline QuickReplyButton() : QuickReplyButton(nullptr) {}
   ~QuickReplyButton() override;
-  explicit constexpr QuickReplyButton(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR QuickReplyButton(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   QuickReplyButton(const QuickReplyButton& from);
   QuickReplyButton(QuickReplyButton&& from) noexcept
@@ -2144,7 +2160,12 @@ class QuickReplyButton final :
   }
   inline void Swap(QuickReplyButton* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -2158,34 +2179,34 @@ class QuickReplyButton final :
 
   // implements Message ----------------------------------------------
 
-  inline QuickReplyButton* New() const final {
-    return new QuickReplyButton();
-  }
-
-  QuickReplyButton* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  QuickReplyButton* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<QuickReplyButton>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const QuickReplyButton& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const QuickReplyButton& from);
+  void MergeFrom( const QuickReplyButton& from) {
+    QuickReplyButton::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(QuickReplyButton* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.QuickReplyButton";
@@ -2193,9 +2214,6 @@ class QuickReplyButton final :
   protected:
   explicit QuickReplyButton(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -2221,7 +2239,7 @@ class QuickReplyButton final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_id(ArgT0&& arg0, ArgT... args);
   std::string* mutable_id();
-  PROTOBUF_MUST_USE_RESULT std::string* release_id();
+  PROTOBUF_NODISCARD std::string* release_id();
   void set_allocated_id(std::string* id);
   private:
   const std::string& _internal_id() const;
@@ -2236,7 +2254,7 @@ class QuickReplyButton final :
   public:
   void clear_displaytext();
   const ::proto::HighlyStructuredMessage& displaytext() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::HighlyStructuredMessage* release_displaytext();
+  PROTOBUF_NODISCARD ::proto::HighlyStructuredMessage* release_displaytext();
   ::proto::HighlyStructuredMessage* mutable_displaytext();
   void set_allocated_displaytext(::proto::HighlyStructuredMessage* displaytext);
   private:
@@ -2254,10 +2272,13 @@ class QuickReplyButton final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr id_;
-  ::proto::HighlyStructuredMessage* displaytext_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr id_;
+    ::proto::HighlyStructuredMessage* displaytext_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -2267,7 +2288,7 @@ class URLButton final :
  public:
   inline URLButton() : URLButton(nullptr) {}
   ~URLButton() override;
-  explicit constexpr URLButton(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR URLButton(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   URLButton(const URLButton& from);
   URLButton(URLButton&& from) noexcept
@@ -2324,7 +2345,12 @@ class URLButton final :
   }
   inline void Swap(URLButton* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -2338,34 +2364,34 @@ class URLButton final :
 
   // implements Message ----------------------------------------------
 
-  inline URLButton* New() const final {
-    return new URLButton();
-  }
-
-  URLButton* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  URLButton* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<URLButton>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const URLButton& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const URLButton& from);
+  void MergeFrom( const URLButton& from) {
+    URLButton::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(URLButton* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.URLButton";
@@ -2373,9 +2399,6 @@ class URLButton final :
   protected:
   explicit URLButton(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -2398,7 +2421,7 @@ class URLButton final :
   public:
   void clear_displaytext();
   const ::proto::HighlyStructuredMessage& displaytext() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::HighlyStructuredMessage* release_displaytext();
+  PROTOBUF_NODISCARD ::proto::HighlyStructuredMessage* release_displaytext();
   ::proto::HighlyStructuredMessage* mutable_displaytext();
   void set_allocated_displaytext(::proto::HighlyStructuredMessage* displaytext);
   private:
@@ -2416,7 +2439,7 @@ class URLButton final :
   public:
   void clear_url();
   const ::proto::HighlyStructuredMessage& url() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::HighlyStructuredMessage* release_url();
+  PROTOBUF_NODISCARD ::proto::HighlyStructuredMessage* release_url();
   ::proto::HighlyStructuredMessage* mutable_url();
   void set_allocated_url(::proto::HighlyStructuredMessage* url);
   private:
@@ -2434,10 +2457,13 @@ class URLButton final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::proto::HighlyStructuredMessage* displaytext_;
-  ::proto::HighlyStructuredMessage* url_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::proto::HighlyStructuredMessage* displaytext_;
+    ::proto::HighlyStructuredMessage* url_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -2447,7 +2473,7 @@ class CallButton final :
  public:
   inline CallButton() : CallButton(nullptr) {}
   ~CallButton() override;
-  explicit constexpr CallButton(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR CallButton(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   CallButton(const CallButton& from);
   CallButton(CallButton&& from) noexcept
@@ -2504,7 +2530,12 @@ class CallButton final :
   }
   inline void Swap(CallButton* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -2518,34 +2549,34 @@ class CallButton final :
 
   // implements Message ----------------------------------------------
 
-  inline CallButton* New() const final {
-    return new CallButton();
-  }
-
-  CallButton* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  CallButton* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<CallButton>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const CallButton& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const CallButton& from);
+  void MergeFrom( const CallButton& from) {
+    CallButton::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(CallButton* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.CallButton";
@@ -2553,9 +2584,6 @@ class CallButton final :
   protected:
   explicit CallButton(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -2578,7 +2606,7 @@ class CallButton final :
   public:
   void clear_displaytext();
   const ::proto::HighlyStructuredMessage& displaytext() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::HighlyStructuredMessage* release_displaytext();
+  PROTOBUF_NODISCARD ::proto::HighlyStructuredMessage* release_displaytext();
   ::proto::HighlyStructuredMessage* mutable_displaytext();
   void set_allocated_displaytext(::proto::HighlyStructuredMessage* displaytext);
   private:
@@ -2596,7 +2624,7 @@ class CallButton final :
   public:
   void clear_phonenumber();
   const ::proto::HighlyStructuredMessage& phonenumber() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::HighlyStructuredMessage* release_phonenumber();
+  PROTOBUF_NODISCARD ::proto::HighlyStructuredMessage* release_phonenumber();
   ::proto::HighlyStructuredMessage* mutable_phonenumber();
   void set_allocated_phonenumber(::proto::HighlyStructuredMessage* phonenumber);
   private:
@@ -2614,10 +2642,13 @@ class CallButton final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::proto::HighlyStructuredMessage* displaytext_;
-  ::proto::HighlyStructuredMessage* phonenumber_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::proto::HighlyStructuredMessage* displaytext_;
+    ::proto::HighlyStructuredMessage* phonenumber_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -2627,7 +2658,7 @@ class TemplateButton final :
  public:
   inline TemplateButton() : TemplateButton(nullptr) {}
   ~TemplateButton() override;
-  explicit constexpr TemplateButton(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR TemplateButton(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   TemplateButton(const TemplateButton& from);
   TemplateButton(TemplateButton&& from) noexcept
@@ -2691,7 +2722,12 @@ class TemplateButton final :
   }
   inline void Swap(TemplateButton* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -2705,34 +2741,34 @@ class TemplateButton final :
 
   // implements Message ----------------------------------------------
 
-  inline TemplateButton* New() const final {
-    return new TemplateButton();
-  }
-
-  TemplateButton* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  TemplateButton* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<TemplateButton>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const TemplateButton& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const TemplateButton& from);
+  void MergeFrom( const TemplateButton& from) {
+    TemplateButton::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(TemplateButton* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.TemplateButton";
@@ -2740,9 +2776,6 @@ class TemplateButton final :
   protected:
   explicit TemplateButton(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -2766,11 +2799,11 @@ class TemplateButton final :
   bool _internal_has_index() const;
   public:
   void clear_index();
-  ::PROTOBUF_NAMESPACE_ID::uint32 index() const;
-  void set_index(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t index() const;
+  void set_index(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_index() const;
-  void _internal_set_index(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_index() const;
+  void _internal_set_index(uint32_t value);
   public:
 
   // .proto.QuickReplyButton quickReplyButton = 1;
@@ -2780,7 +2813,7 @@ class TemplateButton final :
   public:
   void clear_quickreplybutton();
   const ::proto::QuickReplyButton& quickreplybutton() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::QuickReplyButton* release_quickreplybutton();
+  PROTOBUF_NODISCARD ::proto::QuickReplyButton* release_quickreplybutton();
   ::proto::QuickReplyButton* mutable_quickreplybutton();
   void set_allocated_quickreplybutton(::proto::QuickReplyButton* quickreplybutton);
   private:
@@ -2798,7 +2831,7 @@ class TemplateButton final :
   public:
   void clear_urlbutton();
   const ::proto::URLButton& urlbutton() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::URLButton* release_urlbutton();
+  PROTOBUF_NODISCARD ::proto::URLButton* release_urlbutton();
   ::proto::URLButton* mutable_urlbutton();
   void set_allocated_urlbutton(::proto::URLButton* urlbutton);
   private:
@@ -2816,7 +2849,7 @@ class TemplateButton final :
   public:
   void clear_callbutton();
   const ::proto::CallButton& callbutton() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::CallButton* release_callbutton();
+  PROTOBUF_NODISCARD ::proto::CallButton* release_callbutton();
   ::proto::CallButton* mutable_callbutton();
   void set_allocated_callbutton(::proto::CallButton* callbutton);
   private:
@@ -2842,18 +2875,21 @@ class TemplateButton final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 index_;
-  union ButtonUnion {
-    constexpr ButtonUnion() : _constinit_{} {}
-      ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized _constinit_;
-    ::proto::QuickReplyButton* quickreplybutton_;
-    ::proto::URLButton* urlbutton_;
-    ::proto::CallButton* callbutton_;
-  } button_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 _oneof_case_[1];
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    uint32_t index_;
+    union ButtonUnion {
+      constexpr ButtonUnion() : _constinit_{} {}
+        ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized _constinit_;
+      ::proto::QuickReplyButton* quickreplybutton_;
+      ::proto::URLButton* urlbutton_;
+      ::proto::CallButton* callbutton_;
+    } button_;
+    uint32_t _oneof_case_[1];
 
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -2863,7 +2899,7 @@ class Location final :
  public:
   inline Location() : Location(nullptr) {}
   ~Location() override;
-  explicit constexpr Location(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR Location(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   Location(const Location& from);
   Location(Location&& from) noexcept
@@ -2920,7 +2956,12 @@ class Location final :
   }
   inline void Swap(Location* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -2934,34 +2975,34 @@ class Location final :
 
   // implements Message ----------------------------------------------
 
-  inline Location* New() const final {
-    return new Location();
-  }
-
-  Location* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  Location* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<Location>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const Location& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const Location& from);
+  void MergeFrom( const Location& from) {
+    Location::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(Location* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.Location";
@@ -2969,9 +3010,6 @@ class Location final :
   protected:
   explicit Location(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -2998,7 +3036,7 @@ class Location final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_name(ArgT0&& arg0, ArgT... args);
   std::string* mutable_name();
-  PROTOBUF_MUST_USE_RESULT std::string* release_name();
+  PROTOBUF_NODISCARD std::string* release_name();
   void set_allocated_name(std::string* name);
   private:
   const std::string& _internal_name() const;
@@ -3039,11 +3077,14 @@ class Location final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_;
-  double degreeslatitude_;
-  double degreeslongitude_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_;
+    double degreeslatitude_;
+    double degreeslongitude_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -3053,7 +3094,7 @@ class Point final :
  public:
   inline Point() : Point(nullptr) {}
   ~Point() override;
-  explicit constexpr Point(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR Point(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   Point(const Point& from);
   Point(Point&& from) noexcept
@@ -3110,7 +3151,12 @@ class Point final :
   }
   inline void Swap(Point* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -3124,34 +3170,34 @@ class Point final :
 
   // implements Message ----------------------------------------------
 
-  inline Point* New() const final {
-    return new Point();
-  }
-
-  Point* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  Point* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<Point>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const Point& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const Point& from);
+  void MergeFrom( const Point& from) {
+    Point::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(Point* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.Point";
@@ -3159,9 +3205,6 @@ class Point final :
   protected:
   explicit Point(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -3185,11 +3228,11 @@ class Point final :
   bool _internal_has_xdeprecated() const;
   public:
   void clear_xdeprecated();
-  ::PROTOBUF_NAMESPACE_ID::int32 xdeprecated() const;
-  void set_xdeprecated(::PROTOBUF_NAMESPACE_ID::int32 value);
+  int32_t xdeprecated() const;
+  void set_xdeprecated(int32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::int32 _internal_xdeprecated() const;
-  void _internal_set_xdeprecated(::PROTOBUF_NAMESPACE_ID::int32 value);
+  int32_t _internal_xdeprecated() const;
+  void _internal_set_xdeprecated(int32_t value);
   public:
 
   // optional int32 yDeprecated = 2;
@@ -3198,11 +3241,11 @@ class Point final :
   bool _internal_has_ydeprecated() const;
   public:
   void clear_ydeprecated();
-  ::PROTOBUF_NAMESPACE_ID::int32 ydeprecated() const;
-  void set_ydeprecated(::PROTOBUF_NAMESPACE_ID::int32 value);
+  int32_t ydeprecated() const;
+  void set_ydeprecated(int32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::int32 _internal_ydeprecated() const;
-  void _internal_set_ydeprecated(::PROTOBUF_NAMESPACE_ID::int32 value);
+  int32_t _internal_ydeprecated() const;
+  void _internal_set_ydeprecated(int32_t value);
   public:
 
   // optional double x = 3;
@@ -3238,12 +3281,15 @@ class Point final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::int32 xdeprecated_;
-  ::PROTOBUF_NAMESPACE_ID::int32 ydeprecated_;
-  double x_;
-  double y_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    int32_t xdeprecated_;
+    int32_t ydeprecated_;
+    double x_;
+    double y_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -3253,7 +3299,7 @@ class InteractiveAnnotation final :
  public:
   inline InteractiveAnnotation() : InteractiveAnnotation(nullptr) {}
   ~InteractiveAnnotation() override;
-  explicit constexpr InteractiveAnnotation(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR InteractiveAnnotation(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   InteractiveAnnotation(const InteractiveAnnotation& from);
   InteractiveAnnotation(InteractiveAnnotation&& from) noexcept
@@ -3315,7 +3361,12 @@ class InteractiveAnnotation final :
   }
   inline void Swap(InteractiveAnnotation* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -3329,34 +3380,34 @@ class InteractiveAnnotation final :
 
   // implements Message ----------------------------------------------
 
-  inline InteractiveAnnotation* New() const final {
-    return new InteractiveAnnotation();
-  }
-
-  InteractiveAnnotation* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  InteractiveAnnotation* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<InteractiveAnnotation>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const InteractiveAnnotation& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const InteractiveAnnotation& from);
+  void MergeFrom( const InteractiveAnnotation& from) {
+    InteractiveAnnotation::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(InteractiveAnnotation* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.InteractiveAnnotation";
@@ -3364,9 +3415,6 @@ class InteractiveAnnotation final :
   protected:
   explicit InteractiveAnnotation(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -3407,7 +3455,7 @@ class InteractiveAnnotation final :
   public:
   void clear_location();
   const ::proto::Location& location() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::Location* release_location();
+  PROTOBUF_NODISCARD ::proto::Location* release_location();
   ::proto::Location* mutable_location();
   void set_allocated_location(::proto::Location* location);
   private:
@@ -3431,15 +3479,18 @@ class InteractiveAnnotation final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::Point > polygonvertices_;
-  union ActionUnion {
-    constexpr ActionUnion() : _constinit_{} {}
-      ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized _constinit_;
-    ::proto::Location* location_;
-  } action_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 _oneof_case_[1];
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::Point > polygonvertices_;
+    union ActionUnion {
+      constexpr ActionUnion() : _constinit_{} {}
+        ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized _constinit_;
+      ::proto::Location* location_;
+    } action_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    uint32_t _oneof_case_[1];
 
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -3449,7 +3500,7 @@ class DeviceListMetadata final :
  public:
   inline DeviceListMetadata() : DeviceListMetadata(nullptr) {}
   ~DeviceListMetadata() override;
-  explicit constexpr DeviceListMetadata(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR DeviceListMetadata(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   DeviceListMetadata(const DeviceListMetadata& from);
   DeviceListMetadata(DeviceListMetadata&& from) noexcept
@@ -3506,7 +3557,12 @@ class DeviceListMetadata final :
   }
   inline void Swap(DeviceListMetadata* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -3520,34 +3576,34 @@ class DeviceListMetadata final :
 
   // implements Message ----------------------------------------------
 
-  inline DeviceListMetadata* New() const final {
-    return new DeviceListMetadata();
-  }
-
-  DeviceListMetadata* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  DeviceListMetadata* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<DeviceListMetadata>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const DeviceListMetadata& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const DeviceListMetadata& from);
+  void MergeFrom( const DeviceListMetadata& from) {
+    DeviceListMetadata::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(DeviceListMetadata* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.DeviceListMetadata";
@@ -3555,9 +3611,6 @@ class DeviceListMetadata final :
   protected:
   explicit DeviceListMetadata(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -3585,7 +3638,7 @@ class DeviceListMetadata final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_senderkeyhash(ArgT0&& arg0, ArgT... args);
   std::string* mutable_senderkeyhash();
-  PROTOBUF_MUST_USE_RESULT std::string* release_senderkeyhash();
+  PROTOBUF_NODISCARD std::string* release_senderkeyhash();
   void set_allocated_senderkeyhash(std::string* senderkeyhash);
   private:
   const std::string& _internal_senderkeyhash() const;
@@ -3603,7 +3656,7 @@ class DeviceListMetadata final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_recipientkeyhash(ArgT0&& arg0, ArgT... args);
   std::string* mutable_recipientkeyhash();
-  PROTOBUF_MUST_USE_RESULT std::string* release_recipientkeyhash();
+  PROTOBUF_NODISCARD std::string* release_recipientkeyhash();
   void set_allocated_recipientkeyhash(std::string* recipientkeyhash);
   private:
   const std::string& _internal_recipientkeyhash() const;
@@ -3617,11 +3670,11 @@ class DeviceListMetadata final :
   bool _internal_has_sendertimestamp() const;
   public:
   void clear_sendertimestamp();
-  ::PROTOBUF_NAMESPACE_ID::uint64 sendertimestamp() const;
-  void set_sendertimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t sendertimestamp() const;
+  void set_sendertimestamp(uint64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint64 _internal_sendertimestamp() const;
-  void _internal_set_sendertimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t _internal_sendertimestamp() const;
+  void _internal_set_sendertimestamp(uint64_t value);
   public:
 
   // optional uint64 recipientTimestamp = 9;
@@ -3630,11 +3683,11 @@ class DeviceListMetadata final :
   bool _internal_has_recipienttimestamp() const;
   public:
   void clear_recipienttimestamp();
-  ::PROTOBUF_NAMESPACE_ID::uint64 recipienttimestamp() const;
-  void set_recipienttimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t recipienttimestamp() const;
+  void set_recipienttimestamp(uint64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint64 _internal_recipienttimestamp() const;
-  void _internal_set_recipienttimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t _internal_recipienttimestamp() const;
+  void _internal_set_recipienttimestamp(uint64_t value);
   public:
 
   // @@protoc_insertion_point(class_scope:proto.DeviceListMetadata)
@@ -3644,12 +3697,15 @@ class DeviceListMetadata final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr senderkeyhash_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr recipientkeyhash_;
-  ::PROTOBUF_NAMESPACE_ID::uint64 sendertimestamp_;
-  ::PROTOBUF_NAMESPACE_ID::uint64 recipienttimestamp_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr senderkeyhash_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr recipientkeyhash_;
+    uint64_t sendertimestamp_;
+    uint64_t recipienttimestamp_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -3659,7 +3715,7 @@ class MessageContextInfo final :
  public:
   inline MessageContextInfo() : MessageContextInfo(nullptr) {}
   ~MessageContextInfo() override;
-  explicit constexpr MessageContextInfo(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR MessageContextInfo(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   MessageContextInfo(const MessageContextInfo& from);
   MessageContextInfo(MessageContextInfo&& from) noexcept
@@ -3716,7 +3772,12 @@ class MessageContextInfo final :
   }
   inline void Swap(MessageContextInfo* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -3730,34 +3791,34 @@ class MessageContextInfo final :
 
   // implements Message ----------------------------------------------
 
-  inline MessageContextInfo* New() const final {
-    return new MessageContextInfo();
-  }
-
-  MessageContextInfo* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  MessageContextInfo* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<MessageContextInfo>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const MessageContextInfo& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const MessageContextInfo& from);
+  void MergeFrom( const MessageContextInfo& from) {
+    MessageContextInfo::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(MessageContextInfo* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.MessageContextInfo";
@@ -3765,9 +3826,6 @@ class MessageContextInfo final :
   protected:
   explicit MessageContextInfo(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -3789,7 +3847,7 @@ class MessageContextInfo final :
   public:
   void clear_devicelistmetadata();
   const ::proto::DeviceListMetadata& devicelistmetadata() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::DeviceListMetadata* release_devicelistmetadata();
+  PROTOBUF_NODISCARD ::proto::DeviceListMetadata* release_devicelistmetadata();
   ::proto::DeviceListMetadata* mutable_devicelistmetadata();
   void set_allocated_devicelistmetadata(::proto::DeviceListMetadata* devicelistmetadata);
   private:
@@ -3807,9 +3865,12 @@ class MessageContextInfo final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::proto::DeviceListMetadata* devicelistmetadata_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::proto::DeviceListMetadata* devicelistmetadata_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -3819,7 +3880,7 @@ class AdReplyInfo final :
  public:
   inline AdReplyInfo() : AdReplyInfo(nullptr) {}
   ~AdReplyInfo() override;
-  explicit constexpr AdReplyInfo(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR AdReplyInfo(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   AdReplyInfo(const AdReplyInfo& from);
   AdReplyInfo(AdReplyInfo&& from) noexcept
@@ -3876,7 +3937,12 @@ class AdReplyInfo final :
   }
   inline void Swap(AdReplyInfo* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -3890,34 +3956,34 @@ class AdReplyInfo final :
 
   // implements Message ----------------------------------------------
 
-  inline AdReplyInfo* New() const final {
-    return new AdReplyInfo();
-  }
-
-  AdReplyInfo* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  AdReplyInfo* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<AdReplyInfo>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const AdReplyInfo& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const AdReplyInfo& from);
+  void MergeFrom( const AdReplyInfo& from) {
+    AdReplyInfo::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(AdReplyInfo* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.AdReplyInfo";
@@ -3925,9 +3991,6 @@ class AdReplyInfo final :
   protected:
   explicit AdReplyInfo(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -3987,7 +4050,7 @@ class AdReplyInfo final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_advertisername(ArgT0&& arg0, ArgT... args);
   std::string* mutable_advertisername();
-  PROTOBUF_MUST_USE_RESULT std::string* release_advertisername();
+  PROTOBUF_NODISCARD std::string* release_advertisername();
   void set_allocated_advertisername(std::string* advertisername);
   private:
   const std::string& _internal_advertisername() const;
@@ -4005,7 +4068,7 @@ class AdReplyInfo final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_jpegthumbnail(ArgT0&& arg0, ArgT... args);
   std::string* mutable_jpegthumbnail();
-  PROTOBUF_MUST_USE_RESULT std::string* release_jpegthumbnail();
+  PROTOBUF_NODISCARD std::string* release_jpegthumbnail();
   void set_allocated_jpegthumbnail(std::string* jpegthumbnail);
   private:
   const std::string& _internal_jpegthumbnail() const;
@@ -4023,7 +4086,7 @@ class AdReplyInfo final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_caption(ArgT0&& arg0, ArgT... args);
   std::string* mutable_caption();
-  PROTOBUF_MUST_USE_RESULT std::string* release_caption();
+  PROTOBUF_NODISCARD std::string* release_caption();
   void set_allocated_caption(std::string* caption);
   private:
   const std::string& _internal_caption() const;
@@ -4051,12 +4114,15 @@ class AdReplyInfo final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr advertisername_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr jpegthumbnail_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr caption_;
-  int mediatype_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr advertisername_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr jpegthumbnail_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr caption_;
+    int mediatype_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -4066,7 +4132,7 @@ class ExternalAdReplyInfo final :
  public:
   inline ExternalAdReplyInfo() : ExternalAdReplyInfo(nullptr) {}
   ~ExternalAdReplyInfo() override;
-  explicit constexpr ExternalAdReplyInfo(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR ExternalAdReplyInfo(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   ExternalAdReplyInfo(const ExternalAdReplyInfo& from);
   ExternalAdReplyInfo(ExternalAdReplyInfo&& from) noexcept
@@ -4123,7 +4189,12 @@ class ExternalAdReplyInfo final :
   }
   inline void Swap(ExternalAdReplyInfo* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -4137,34 +4208,34 @@ class ExternalAdReplyInfo final :
 
   // implements Message ----------------------------------------------
 
-  inline ExternalAdReplyInfo* New() const final {
-    return new ExternalAdReplyInfo();
-  }
-
-  ExternalAdReplyInfo* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  ExternalAdReplyInfo* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<ExternalAdReplyInfo>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const ExternalAdReplyInfo& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const ExternalAdReplyInfo& from);
+  void MergeFrom( const ExternalAdReplyInfo& from) {
+    ExternalAdReplyInfo::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(ExternalAdReplyInfo* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.ExternalAdReplyInfo";
@@ -4172,9 +4243,6 @@ class ExternalAdReplyInfo final :
   protected:
   explicit ExternalAdReplyInfo(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -4239,7 +4307,7 @@ class ExternalAdReplyInfo final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_title(ArgT0&& arg0, ArgT... args);
   std::string* mutable_title();
-  PROTOBUF_MUST_USE_RESULT std::string* release_title();
+  PROTOBUF_NODISCARD std::string* release_title();
   void set_allocated_title(std::string* title);
   private:
   const std::string& _internal_title() const;
@@ -4257,7 +4325,7 @@ class ExternalAdReplyInfo final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_body(ArgT0&& arg0, ArgT... args);
   std::string* mutable_body();
-  PROTOBUF_MUST_USE_RESULT std::string* release_body();
+  PROTOBUF_NODISCARD std::string* release_body();
   void set_allocated_body(std::string* body);
   private:
   const std::string& _internal_body() const;
@@ -4275,7 +4343,7 @@ class ExternalAdReplyInfo final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_thumbnailurl(ArgT0&& arg0, ArgT... args);
   std::string* mutable_thumbnailurl();
-  PROTOBUF_MUST_USE_RESULT std::string* release_thumbnailurl();
+  PROTOBUF_NODISCARD std::string* release_thumbnailurl();
   void set_allocated_thumbnailurl(std::string* thumbnailurl);
   private:
   const std::string& _internal_thumbnailurl() const;
@@ -4293,7 +4361,7 @@ class ExternalAdReplyInfo final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_mediaurl(ArgT0&& arg0, ArgT... args);
   std::string* mutable_mediaurl();
-  PROTOBUF_MUST_USE_RESULT std::string* release_mediaurl();
+  PROTOBUF_NODISCARD std::string* release_mediaurl();
   void set_allocated_mediaurl(std::string* mediaurl);
   private:
   const std::string& _internal_mediaurl() const;
@@ -4311,7 +4379,7 @@ class ExternalAdReplyInfo final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_thumbnail(ArgT0&& arg0, ArgT... args);
   std::string* mutable_thumbnail();
-  PROTOBUF_MUST_USE_RESULT std::string* release_thumbnail();
+  PROTOBUF_NODISCARD std::string* release_thumbnail();
   void set_allocated_thumbnail(std::string* thumbnail);
   private:
   const std::string& _internal_thumbnail() const;
@@ -4329,7 +4397,7 @@ class ExternalAdReplyInfo final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_sourcetype(ArgT0&& arg0, ArgT... args);
   std::string* mutable_sourcetype();
-  PROTOBUF_MUST_USE_RESULT std::string* release_sourcetype();
+  PROTOBUF_NODISCARD std::string* release_sourcetype();
   void set_allocated_sourcetype(std::string* sourcetype);
   private:
   const std::string& _internal_sourcetype() const;
@@ -4347,7 +4415,7 @@ class ExternalAdReplyInfo final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_sourceid(ArgT0&& arg0, ArgT... args);
   std::string* mutable_sourceid();
-  PROTOBUF_MUST_USE_RESULT std::string* release_sourceid();
+  PROTOBUF_NODISCARD std::string* release_sourceid();
   void set_allocated_sourceid(std::string* sourceid);
   private:
   const std::string& _internal_sourceid() const;
@@ -4365,7 +4433,7 @@ class ExternalAdReplyInfo final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_sourceurl(ArgT0&& arg0, ArgT... args);
   std::string* mutable_sourceurl();
-  PROTOBUF_MUST_USE_RESULT std::string* release_sourceurl();
+  PROTOBUF_NODISCARD std::string* release_sourceurl();
   void set_allocated_sourceurl(std::string* sourceurl);
   private:
   const std::string& _internal_sourceurl() const;
@@ -4393,17 +4461,20 @@ class ExternalAdReplyInfo final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr title_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr body_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr thumbnailurl_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr mediaurl_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr thumbnail_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr sourcetype_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr sourceid_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr sourceurl_;
-  int mediatype_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr title_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr body_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr thumbnailurl_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr mediaurl_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr thumbnail_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr sourcetype_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr sourceid_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr sourceurl_;
+    int mediatype_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -4413,7 +4484,7 @@ class ContextInfo final :
  public:
   inline ContextInfo() : ContextInfo(nullptr) {}
   ~ContextInfo() override;
-  explicit constexpr ContextInfo(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR ContextInfo(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   ContextInfo(const ContextInfo& from);
   ContextInfo(ContextInfo&& from) noexcept
@@ -4470,7 +4541,12 @@ class ContextInfo final :
   }
   inline void Swap(ContextInfo* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -4484,34 +4560,34 @@ class ContextInfo final :
 
   // implements Message ----------------------------------------------
 
-  inline ContextInfo* New() const final {
-    return new ContextInfo();
-  }
-
-  ContextInfo* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  ContextInfo* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<ContextInfo>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const ContextInfo& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const ContextInfo& from);
+  void MergeFrom( const ContextInfo& from) {
+    ContextInfo::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(ContextInfo* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.ContextInfo";
@@ -4519,9 +4595,6 @@ class ContextInfo final :
   protected:
   explicit ContextInfo(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -4585,7 +4658,7 @@ class ContextInfo final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_stanzaid(ArgT0&& arg0, ArgT... args);
   std::string* mutable_stanzaid();
-  PROTOBUF_MUST_USE_RESULT std::string* release_stanzaid();
+  PROTOBUF_NODISCARD std::string* release_stanzaid();
   void set_allocated_stanzaid(std::string* stanzaid);
   private:
   const std::string& _internal_stanzaid() const;
@@ -4603,7 +4676,7 @@ class ContextInfo final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_participant(ArgT0&& arg0, ArgT... args);
   std::string* mutable_participant();
-  PROTOBUF_MUST_USE_RESULT std::string* release_participant();
+  PROTOBUF_NODISCARD std::string* release_participant();
   void set_allocated_participant(std::string* participant);
   private:
   const std::string& _internal_participant() const;
@@ -4621,7 +4694,7 @@ class ContextInfo final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_remotejid(ArgT0&& arg0, ArgT... args);
   std::string* mutable_remotejid();
-  PROTOBUF_MUST_USE_RESULT std::string* release_remotejid();
+  PROTOBUF_NODISCARD std::string* release_remotejid();
   void set_allocated_remotejid(std::string* remotejid);
   private:
   const std::string& _internal_remotejid() const;
@@ -4639,7 +4712,7 @@ class ContextInfo final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_conversionsource(ArgT0&& arg0, ArgT... args);
   std::string* mutable_conversionsource();
-  PROTOBUF_MUST_USE_RESULT std::string* release_conversionsource();
+  PROTOBUF_NODISCARD std::string* release_conversionsource();
   void set_allocated_conversionsource(std::string* conversionsource);
   private:
   const std::string& _internal_conversionsource() const;
@@ -4657,7 +4730,7 @@ class ContextInfo final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_conversiondata(ArgT0&& arg0, ArgT... args);
   std::string* mutable_conversiondata();
-  PROTOBUF_MUST_USE_RESULT std::string* release_conversiondata();
+  PROTOBUF_NODISCARD std::string* release_conversiondata();
   void set_allocated_conversiondata(std::string* conversiondata);
   private:
   const std::string& _internal_conversiondata() const;
@@ -4675,7 +4748,7 @@ class ContextInfo final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_ephemeralsharedsecret(ArgT0&& arg0, ArgT... args);
   std::string* mutable_ephemeralsharedsecret();
-  PROTOBUF_MUST_USE_RESULT std::string* release_ephemeralsharedsecret();
+  PROTOBUF_NODISCARD std::string* release_ephemeralsharedsecret();
   void set_allocated_ephemeralsharedsecret(std::string* ephemeralsharedsecret);
   private:
   const std::string& _internal_ephemeralsharedsecret() const;
@@ -4690,7 +4763,7 @@ class ContextInfo final :
   public:
   void clear_quotedmessage();
   const ::proto::Message& quotedmessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::Message* release_quotedmessage();
+  PROTOBUF_NODISCARD ::proto::Message* release_quotedmessage();
   ::proto::Message* mutable_quotedmessage();
   void set_allocated_quotedmessage(::proto::Message* quotedmessage);
   private:
@@ -4708,7 +4781,7 @@ class ContextInfo final :
   public:
   void clear_quotedad();
   const ::proto::AdReplyInfo& quotedad() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::AdReplyInfo* release_quotedad();
+  PROTOBUF_NODISCARD ::proto::AdReplyInfo* release_quotedad();
   ::proto::AdReplyInfo* mutable_quotedad();
   void set_allocated_quotedad(::proto::AdReplyInfo* quotedad);
   private:
@@ -4726,7 +4799,7 @@ class ContextInfo final :
   public:
   void clear_placeholderkey();
   const ::proto::MessageKey& placeholderkey() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::MessageKey* release_placeholderkey();
+  PROTOBUF_NODISCARD ::proto::MessageKey* release_placeholderkey();
   ::proto::MessageKey* mutable_placeholderkey();
   void set_allocated_placeholderkey(::proto::MessageKey* placeholderkey);
   private:
@@ -4744,7 +4817,7 @@ class ContextInfo final :
   public:
   void clear_externaladreply();
   const ::proto::ExternalAdReplyInfo& externaladreply() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ExternalAdReplyInfo* release_externaladreply();
+  PROTOBUF_NODISCARD ::proto::ExternalAdReplyInfo* release_externaladreply();
   ::proto::ExternalAdReplyInfo* mutable_externaladreply();
   void set_allocated_externaladreply(::proto::ExternalAdReplyInfo* externaladreply);
   private:
@@ -4761,11 +4834,11 @@ class ContextInfo final :
   bool _internal_has_conversiondelayseconds() const;
   public:
   void clear_conversiondelayseconds();
-  ::PROTOBUF_NAMESPACE_ID::uint32 conversiondelayseconds() const;
-  void set_conversiondelayseconds(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t conversiondelayseconds() const;
+  void set_conversiondelayseconds(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_conversiondelayseconds() const;
-  void _internal_set_conversiondelayseconds(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_conversiondelayseconds() const;
+  void _internal_set_conversiondelayseconds(uint32_t value);
   public:
 
   // optional uint32 forwardingScore = 21;
@@ -4774,11 +4847,11 @@ class ContextInfo final :
   bool _internal_has_forwardingscore() const;
   public:
   void clear_forwardingscore();
-  ::PROTOBUF_NAMESPACE_ID::uint32 forwardingscore() const;
-  void set_forwardingscore(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t forwardingscore() const;
+  void set_forwardingscore(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_forwardingscore() const;
-  void _internal_set_forwardingscore(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_forwardingscore() const;
+  void _internal_set_forwardingscore(uint32_t value);
   public:
 
   // optional bool isForwarded = 22;
@@ -4800,11 +4873,11 @@ class ContextInfo final :
   bool _internal_has_expiration() const;
   public:
   void clear_expiration();
-  ::PROTOBUF_NAMESPACE_ID::uint32 expiration() const;
-  void set_expiration(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t expiration() const;
+  void set_expiration(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_expiration() const;
-  void _internal_set_expiration(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_expiration() const;
+  void _internal_set_expiration(uint32_t value);
   public:
 
   // optional int64 ephemeralSettingTimestamp = 26;
@@ -4813,11 +4886,11 @@ class ContextInfo final :
   bool _internal_has_ephemeralsettingtimestamp() const;
   public:
   void clear_ephemeralsettingtimestamp();
-  ::PROTOBUF_NAMESPACE_ID::int64 ephemeralsettingtimestamp() const;
-  void set_ephemeralsettingtimestamp(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t ephemeralsettingtimestamp() const;
+  void set_ephemeralsettingtimestamp(int64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::int64 _internal_ephemeralsettingtimestamp() const;
-  void _internal_set_ephemeralsettingtimestamp(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t _internal_ephemeralsettingtimestamp() const;
+  void _internal_set_ephemeralsettingtimestamp(int64_t value);
   public:
 
   // @@protoc_insertion_point(class_scope:proto.ContextInfo)
@@ -4827,24 +4900,27 @@ class ContextInfo final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> mentionedjid_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr stanzaid_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr participant_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr remotejid_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr conversionsource_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr conversiondata_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr ephemeralsharedsecret_;
-  ::proto::Message* quotedmessage_;
-  ::proto::AdReplyInfo* quotedad_;
-  ::proto::MessageKey* placeholderkey_;
-  ::proto::ExternalAdReplyInfo* externaladreply_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 conversiondelayseconds_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 forwardingscore_;
-  bool isforwarded_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 expiration_;
-  ::PROTOBUF_NAMESPACE_ID::int64 ephemeralsettingtimestamp_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> mentionedjid_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr stanzaid_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr participant_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr remotejid_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr conversionsource_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr conversiondata_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr ephemeralsharedsecret_;
+    ::proto::Message* quotedmessage_;
+    ::proto::AdReplyInfo* quotedad_;
+    ::proto::MessageKey* placeholderkey_;
+    ::proto::ExternalAdReplyInfo* externaladreply_;
+    uint32_t conversiondelayseconds_;
+    uint32_t forwardingscore_;
+    bool isforwarded_;
+    uint32_t expiration_;
+    int64_t ephemeralsettingtimestamp_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -4854,7 +4930,7 @@ class SenderKeyDistributionMessage final :
  public:
   inline SenderKeyDistributionMessage() : SenderKeyDistributionMessage(nullptr) {}
   ~SenderKeyDistributionMessage() override;
-  explicit constexpr SenderKeyDistributionMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR SenderKeyDistributionMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   SenderKeyDistributionMessage(const SenderKeyDistributionMessage& from);
   SenderKeyDistributionMessage(SenderKeyDistributionMessage&& from) noexcept
@@ -4911,7 +4987,12 @@ class SenderKeyDistributionMessage final :
   }
   inline void Swap(SenderKeyDistributionMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -4925,34 +5006,34 @@ class SenderKeyDistributionMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline SenderKeyDistributionMessage* New() const final {
-    return new SenderKeyDistributionMessage();
-  }
-
-  SenderKeyDistributionMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  SenderKeyDistributionMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<SenderKeyDistributionMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const SenderKeyDistributionMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const SenderKeyDistributionMessage& from);
+  void MergeFrom( const SenderKeyDistributionMessage& from) {
+    SenderKeyDistributionMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(SenderKeyDistributionMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.SenderKeyDistributionMessage";
@@ -4960,9 +5041,6 @@ class SenderKeyDistributionMessage final :
   protected:
   explicit SenderKeyDistributionMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -4988,7 +5066,7 @@ class SenderKeyDistributionMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_groupid(ArgT0&& arg0, ArgT... args);
   std::string* mutable_groupid();
-  PROTOBUF_MUST_USE_RESULT std::string* release_groupid();
+  PROTOBUF_NODISCARD std::string* release_groupid();
   void set_allocated_groupid(std::string* groupid);
   private:
   const std::string& _internal_groupid() const;
@@ -5006,7 +5084,7 @@ class SenderKeyDistributionMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_axolotlsenderkeydistributionmessage(ArgT0&& arg0, ArgT... args);
   std::string* mutable_axolotlsenderkeydistributionmessage();
-  PROTOBUF_MUST_USE_RESULT std::string* release_axolotlsenderkeydistributionmessage();
+  PROTOBUF_NODISCARD std::string* release_axolotlsenderkeydistributionmessage();
   void set_allocated_axolotlsenderkeydistributionmessage(std::string* axolotlsenderkeydistributionmessage);
   private:
   const std::string& _internal_axolotlsenderkeydistributionmessage() const;
@@ -5021,10 +5099,13 @@ class SenderKeyDistributionMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr groupid_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr axolotlsenderkeydistributionmessage_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr groupid_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr axolotlsenderkeydistributionmessage_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -5034,7 +5115,7 @@ class ImageMessage final :
  public:
   inline ImageMessage() : ImageMessage(nullptr) {}
   ~ImageMessage() override;
-  explicit constexpr ImageMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR ImageMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   ImageMessage(const ImageMessage& from);
   ImageMessage(ImageMessage&& from) noexcept
@@ -5091,7 +5172,12 @@ class ImageMessage final :
   }
   inline void Swap(ImageMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -5105,34 +5191,34 @@ class ImageMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline ImageMessage* New() const final {
-    return new ImageMessage();
-  }
-
-  ImageMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  ImageMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<ImageMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const ImageMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const ImageMessage& from);
+  void MergeFrom( const ImageMessage& from) {
+    ImageMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(ImageMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.ImageMessage";
@@ -5140,9 +5226,6 @@ class ImageMessage final :
   protected:
   explicit ImageMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -5206,19 +5289,19 @@ class ImageMessage final :
   public:
   void clear_scanlengths();
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_scanlengths(int index) const;
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >&
+  uint32_t _internal_scanlengths(int index) const;
+  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >&
       _internal_scanlengths() const;
-  void _internal_add_scanlengths(::PROTOBUF_NAMESPACE_ID::uint32 value);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >*
+  void _internal_add_scanlengths(uint32_t value);
+  ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >*
       _internal_mutable_scanlengths();
   public:
-  ::PROTOBUF_NAMESPACE_ID::uint32 scanlengths(int index) const;
-  void set_scanlengths(int index, ::PROTOBUF_NAMESPACE_ID::uint32 value);
-  void add_scanlengths(::PROTOBUF_NAMESPACE_ID::uint32 value);
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >&
+  uint32_t scanlengths(int index) const;
+  void set_scanlengths(int index, uint32_t value);
+  void add_scanlengths(uint32_t value);
+  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >&
       scanlengths() const;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >*
+  ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >*
       mutable_scanlengths();
 
   // optional string url = 1;
@@ -5231,7 +5314,7 @@ class ImageMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_url(ArgT0&& arg0, ArgT... args);
   std::string* mutable_url();
-  PROTOBUF_MUST_USE_RESULT std::string* release_url();
+  PROTOBUF_NODISCARD std::string* release_url();
   void set_allocated_url(std::string* url);
   private:
   const std::string& _internal_url() const;
@@ -5249,7 +5332,7 @@ class ImageMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_mimetype(ArgT0&& arg0, ArgT... args);
   std::string* mutable_mimetype();
-  PROTOBUF_MUST_USE_RESULT std::string* release_mimetype();
+  PROTOBUF_NODISCARD std::string* release_mimetype();
   void set_allocated_mimetype(std::string* mimetype);
   private:
   const std::string& _internal_mimetype() const;
@@ -5267,7 +5350,7 @@ class ImageMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_caption(ArgT0&& arg0, ArgT... args);
   std::string* mutable_caption();
-  PROTOBUF_MUST_USE_RESULT std::string* release_caption();
+  PROTOBUF_NODISCARD std::string* release_caption();
   void set_allocated_caption(std::string* caption);
   private:
   const std::string& _internal_caption() const;
@@ -5285,7 +5368,7 @@ class ImageMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_filesha256(ArgT0&& arg0, ArgT... args);
   std::string* mutable_filesha256();
-  PROTOBUF_MUST_USE_RESULT std::string* release_filesha256();
+  PROTOBUF_NODISCARD std::string* release_filesha256();
   void set_allocated_filesha256(std::string* filesha256);
   private:
   const std::string& _internal_filesha256() const;
@@ -5303,7 +5386,7 @@ class ImageMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_mediakey(ArgT0&& arg0, ArgT... args);
   std::string* mutable_mediakey();
-  PROTOBUF_MUST_USE_RESULT std::string* release_mediakey();
+  PROTOBUF_NODISCARD std::string* release_mediakey();
   void set_allocated_mediakey(std::string* mediakey);
   private:
   const std::string& _internal_mediakey() const;
@@ -5321,7 +5404,7 @@ class ImageMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_fileencsha256(ArgT0&& arg0, ArgT... args);
   std::string* mutable_fileencsha256();
-  PROTOBUF_MUST_USE_RESULT std::string* release_fileencsha256();
+  PROTOBUF_NODISCARD std::string* release_fileencsha256();
   void set_allocated_fileencsha256(std::string* fileencsha256);
   private:
   const std::string& _internal_fileencsha256() const;
@@ -5339,7 +5422,7 @@ class ImageMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_directpath(ArgT0&& arg0, ArgT... args);
   std::string* mutable_directpath();
-  PROTOBUF_MUST_USE_RESULT std::string* release_directpath();
+  PROTOBUF_NODISCARD std::string* release_directpath();
   void set_allocated_directpath(std::string* directpath);
   private:
   const std::string& _internal_directpath() const;
@@ -5357,7 +5440,7 @@ class ImageMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_jpegthumbnail(ArgT0&& arg0, ArgT... args);
   std::string* mutable_jpegthumbnail();
-  PROTOBUF_MUST_USE_RESULT std::string* release_jpegthumbnail();
+  PROTOBUF_NODISCARD std::string* release_jpegthumbnail();
   void set_allocated_jpegthumbnail(std::string* jpegthumbnail);
   private:
   const std::string& _internal_jpegthumbnail() const;
@@ -5375,7 +5458,7 @@ class ImageMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_firstscansidecar(ArgT0&& arg0, ArgT... args);
   std::string* mutable_firstscansidecar();
-  PROTOBUF_MUST_USE_RESULT std::string* release_firstscansidecar();
+  PROTOBUF_NODISCARD std::string* release_firstscansidecar();
   void set_allocated_firstscansidecar(std::string* firstscansidecar);
   private:
   const std::string& _internal_firstscansidecar() const;
@@ -5393,7 +5476,7 @@ class ImageMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_scanssidecar(ArgT0&& arg0, ArgT... args);
   std::string* mutable_scanssidecar();
-  PROTOBUF_MUST_USE_RESULT std::string* release_scanssidecar();
+  PROTOBUF_NODISCARD std::string* release_scanssidecar();
   void set_allocated_scanssidecar(std::string* scanssidecar);
   private:
   const std::string& _internal_scanssidecar() const;
@@ -5411,7 +5494,7 @@ class ImageMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_midqualityfilesha256(ArgT0&& arg0, ArgT... args);
   std::string* mutable_midqualityfilesha256();
-  PROTOBUF_MUST_USE_RESULT std::string* release_midqualityfilesha256();
+  PROTOBUF_NODISCARD std::string* release_midqualityfilesha256();
   void set_allocated_midqualityfilesha256(std::string* midqualityfilesha256);
   private:
   const std::string& _internal_midqualityfilesha256() const;
@@ -5429,7 +5512,7 @@ class ImageMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_midqualityfileencsha256(ArgT0&& arg0, ArgT... args);
   std::string* mutable_midqualityfileencsha256();
-  PROTOBUF_MUST_USE_RESULT std::string* release_midqualityfileencsha256();
+  PROTOBUF_NODISCARD std::string* release_midqualityfileencsha256();
   void set_allocated_midqualityfileencsha256(std::string* midqualityfileencsha256);
   private:
   const std::string& _internal_midqualityfileencsha256() const;
@@ -5447,7 +5530,7 @@ class ImageMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_thumbnaildirectpath(ArgT0&& arg0, ArgT... args);
   std::string* mutable_thumbnaildirectpath();
-  PROTOBUF_MUST_USE_RESULT std::string* release_thumbnaildirectpath();
+  PROTOBUF_NODISCARD std::string* release_thumbnaildirectpath();
   void set_allocated_thumbnaildirectpath(std::string* thumbnaildirectpath);
   private:
   const std::string& _internal_thumbnaildirectpath() const;
@@ -5465,7 +5548,7 @@ class ImageMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_thumbnailsha256(ArgT0&& arg0, ArgT... args);
   std::string* mutable_thumbnailsha256();
-  PROTOBUF_MUST_USE_RESULT std::string* release_thumbnailsha256();
+  PROTOBUF_NODISCARD std::string* release_thumbnailsha256();
   void set_allocated_thumbnailsha256(std::string* thumbnailsha256);
   private:
   const std::string& _internal_thumbnailsha256() const;
@@ -5483,7 +5566,7 @@ class ImageMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_thumbnailencsha256(ArgT0&& arg0, ArgT... args);
   std::string* mutable_thumbnailencsha256();
-  PROTOBUF_MUST_USE_RESULT std::string* release_thumbnailencsha256();
+  PROTOBUF_NODISCARD std::string* release_thumbnailencsha256();
   void set_allocated_thumbnailencsha256(std::string* thumbnailencsha256);
   private:
   const std::string& _internal_thumbnailencsha256() const;
@@ -5498,7 +5581,7 @@ class ImageMessage final :
   public:
   void clear_contextinfo();
   const ::proto::ContextInfo& contextinfo() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ContextInfo* release_contextinfo();
+  PROTOBUF_NODISCARD ::proto::ContextInfo* release_contextinfo();
   ::proto::ContextInfo* mutable_contextinfo();
   void set_allocated_contextinfo(::proto::ContextInfo* contextinfo);
   private:
@@ -5515,11 +5598,11 @@ class ImageMessage final :
   bool _internal_has_filelength() const;
   public:
   void clear_filelength();
-  ::PROTOBUF_NAMESPACE_ID::uint64 filelength() const;
-  void set_filelength(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t filelength() const;
+  void set_filelength(uint64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint64 _internal_filelength() const;
-  void _internal_set_filelength(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t _internal_filelength() const;
+  void _internal_set_filelength(uint64_t value);
   public:
 
   // optional uint32 height = 6;
@@ -5528,11 +5611,11 @@ class ImageMessage final :
   bool _internal_has_height() const;
   public:
   void clear_height();
-  ::PROTOBUF_NAMESPACE_ID::uint32 height() const;
-  void set_height(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t height() const;
+  void set_height(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_height() const;
-  void _internal_set_height(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_height() const;
+  void _internal_set_height(uint32_t value);
   public:
 
   // optional uint32 width = 7;
@@ -5541,11 +5624,11 @@ class ImageMessage final :
   bool _internal_has_width() const;
   public:
   void clear_width();
-  ::PROTOBUF_NAMESPACE_ID::uint32 width() const;
-  void set_width(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t width() const;
+  void set_width(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_width() const;
-  void _internal_set_width(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_width() const;
+  void _internal_set_width(uint32_t value);
   public:
 
   // optional int64 mediaKeyTimestamp = 12;
@@ -5554,11 +5637,11 @@ class ImageMessage final :
   bool _internal_has_mediakeytimestamp() const;
   public:
   void clear_mediakeytimestamp();
-  ::PROTOBUF_NAMESPACE_ID::int64 mediakeytimestamp() const;
-  void set_mediakeytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t mediakeytimestamp() const;
+  void set_mediakeytimestamp(int64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::int64 _internal_mediakeytimestamp() const;
-  void _internal_set_mediakeytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t _internal_mediakeytimestamp() const;
+  void _internal_set_mediakeytimestamp(int64_t value);
   public:
 
   // optional uint32 firstScanLength = 19;
@@ -5567,11 +5650,11 @@ class ImageMessage final :
   bool _internal_has_firstscanlength() const;
   public:
   void clear_firstscanlength();
-  ::PROTOBUF_NAMESPACE_ID::uint32 firstscanlength() const;
-  void set_firstscanlength(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t firstscanlength() const;
+  void set_firstscanlength(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_firstscanlength() const;
-  void _internal_set_firstscanlength(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_firstscanlength() const;
+  void _internal_set_firstscanlength(uint32_t value);
   public:
 
   // optional uint32 experimentGroupId = 20;
@@ -5580,11 +5663,11 @@ class ImageMessage final :
   bool _internal_has_experimentgroupid() const;
   public:
   void clear_experimentgroupid();
-  ::PROTOBUF_NAMESPACE_ID::uint32 experimentgroupid() const;
-  void set_experimentgroupid(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t experimentgroupid() const;
+  void set_experimentgroupid(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_experimentgroupid() const;
-  void _internal_set_experimentgroupid(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_experimentgroupid() const;
+  void _internal_set_experimentgroupid(uint32_t value);
   public:
 
   // optional bool viewOnce = 25;
@@ -5607,33 +5690,36 @@ class ImageMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::InteractiveAnnotation > interactiveannotations_;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 > scanlengths_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr url_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr mimetype_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr caption_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr filesha256_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr mediakey_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr fileencsha256_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr directpath_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr jpegthumbnail_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr firstscansidecar_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr scanssidecar_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr midqualityfilesha256_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr midqualityfileencsha256_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr thumbnaildirectpath_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr thumbnailsha256_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr thumbnailencsha256_;
-  ::proto::ContextInfo* contextinfo_;
-  ::PROTOBUF_NAMESPACE_ID::uint64 filelength_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 height_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 width_;
-  ::PROTOBUF_NAMESPACE_ID::int64 mediakeytimestamp_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 firstscanlength_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 experimentgroupid_;
-  bool viewonce_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::InteractiveAnnotation > interactiveannotations_;
+    ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t > scanlengths_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr url_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr mimetype_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr caption_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr filesha256_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr mediakey_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr fileencsha256_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr directpath_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr jpegthumbnail_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr firstscansidecar_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr scanssidecar_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr midqualityfilesha256_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr midqualityfileencsha256_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr thumbnaildirectpath_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr thumbnailsha256_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr thumbnailencsha256_;
+    ::proto::ContextInfo* contextinfo_;
+    uint64_t filelength_;
+    uint32_t height_;
+    uint32_t width_;
+    int64_t mediakeytimestamp_;
+    uint32_t firstscanlength_;
+    uint32_t experimentgroupid_;
+    bool viewonce_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -5643,7 +5729,7 @@ class InvoiceMessage final :
  public:
   inline InvoiceMessage() : InvoiceMessage(nullptr) {}
   ~InvoiceMessage() override;
-  explicit constexpr InvoiceMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR InvoiceMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   InvoiceMessage(const InvoiceMessage& from);
   InvoiceMessage(InvoiceMessage&& from) noexcept
@@ -5700,7 +5786,12 @@ class InvoiceMessage final :
   }
   inline void Swap(InvoiceMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -5714,34 +5805,34 @@ class InvoiceMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline InvoiceMessage* New() const final {
-    return new InvoiceMessage();
-  }
-
-  InvoiceMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  InvoiceMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<InvoiceMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const InvoiceMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const InvoiceMessage& from);
+  void MergeFrom( const InvoiceMessage& from) {
+    InvoiceMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(InvoiceMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.InvoiceMessage";
@@ -5749,9 +5840,6 @@ class InvoiceMessage final :
   protected:
   explicit InvoiceMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -5815,7 +5903,7 @@ class InvoiceMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_note(ArgT0&& arg0, ArgT... args);
   std::string* mutable_note();
-  PROTOBUF_MUST_USE_RESULT std::string* release_note();
+  PROTOBUF_NODISCARD std::string* release_note();
   void set_allocated_note(std::string* note);
   private:
   const std::string& _internal_note() const;
@@ -5833,7 +5921,7 @@ class InvoiceMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_token(ArgT0&& arg0, ArgT... args);
   std::string* mutable_token();
-  PROTOBUF_MUST_USE_RESULT std::string* release_token();
+  PROTOBUF_NODISCARD std::string* release_token();
   void set_allocated_token(std::string* token);
   private:
   const std::string& _internal_token() const;
@@ -5851,7 +5939,7 @@ class InvoiceMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_attachmentmimetype(ArgT0&& arg0, ArgT... args);
   std::string* mutable_attachmentmimetype();
-  PROTOBUF_MUST_USE_RESULT std::string* release_attachmentmimetype();
+  PROTOBUF_NODISCARD std::string* release_attachmentmimetype();
   void set_allocated_attachmentmimetype(std::string* attachmentmimetype);
   private:
   const std::string& _internal_attachmentmimetype() const;
@@ -5869,7 +5957,7 @@ class InvoiceMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_attachmentmediakey(ArgT0&& arg0, ArgT... args);
   std::string* mutable_attachmentmediakey();
-  PROTOBUF_MUST_USE_RESULT std::string* release_attachmentmediakey();
+  PROTOBUF_NODISCARD std::string* release_attachmentmediakey();
   void set_allocated_attachmentmediakey(std::string* attachmentmediakey);
   private:
   const std::string& _internal_attachmentmediakey() const;
@@ -5887,7 +5975,7 @@ class InvoiceMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_attachmentfilesha256(ArgT0&& arg0, ArgT... args);
   std::string* mutable_attachmentfilesha256();
-  PROTOBUF_MUST_USE_RESULT std::string* release_attachmentfilesha256();
+  PROTOBUF_NODISCARD std::string* release_attachmentfilesha256();
   void set_allocated_attachmentfilesha256(std::string* attachmentfilesha256);
   private:
   const std::string& _internal_attachmentfilesha256() const;
@@ -5905,7 +5993,7 @@ class InvoiceMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_attachmentfileencsha256(ArgT0&& arg0, ArgT... args);
   std::string* mutable_attachmentfileencsha256();
-  PROTOBUF_MUST_USE_RESULT std::string* release_attachmentfileencsha256();
+  PROTOBUF_NODISCARD std::string* release_attachmentfileencsha256();
   void set_allocated_attachmentfileencsha256(std::string* attachmentfileencsha256);
   private:
   const std::string& _internal_attachmentfileencsha256() const;
@@ -5923,7 +6011,7 @@ class InvoiceMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_attachmentdirectpath(ArgT0&& arg0, ArgT... args);
   std::string* mutable_attachmentdirectpath();
-  PROTOBUF_MUST_USE_RESULT std::string* release_attachmentdirectpath();
+  PROTOBUF_NODISCARD std::string* release_attachmentdirectpath();
   void set_allocated_attachmentdirectpath(std::string* attachmentdirectpath);
   private:
   const std::string& _internal_attachmentdirectpath() const;
@@ -5941,7 +6029,7 @@ class InvoiceMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_attachmentjpegthumbnail(ArgT0&& arg0, ArgT... args);
   std::string* mutable_attachmentjpegthumbnail();
-  PROTOBUF_MUST_USE_RESULT std::string* release_attachmentjpegthumbnail();
+  PROTOBUF_NODISCARD std::string* release_attachmentjpegthumbnail();
   void set_allocated_attachmentjpegthumbnail(std::string* attachmentjpegthumbnail);
   private:
   const std::string& _internal_attachmentjpegthumbnail() const;
@@ -5955,11 +6043,11 @@ class InvoiceMessage final :
   bool _internal_has_attachmentmediakeytimestamp() const;
   public:
   void clear_attachmentmediakeytimestamp();
-  ::PROTOBUF_NAMESPACE_ID::int64 attachmentmediakeytimestamp() const;
-  void set_attachmentmediakeytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t attachmentmediakeytimestamp() const;
+  void set_attachmentmediakeytimestamp(int64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::int64 _internal_attachmentmediakeytimestamp() const;
-  void _internal_set_attachmentmediakeytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t _internal_attachmentmediakeytimestamp() const;
+  void _internal_set_attachmentmediakeytimestamp(int64_t value);
   public:
 
   // optional .proto.InvoiceMessage.InvoiceMessageAttachmentType attachmentType = 3;
@@ -5982,18 +6070,21 @@ class InvoiceMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr note_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr token_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr attachmentmimetype_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr attachmentmediakey_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr attachmentfilesha256_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr attachmentfileencsha256_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr attachmentdirectpath_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr attachmentjpegthumbnail_;
-  ::PROTOBUF_NAMESPACE_ID::int64 attachmentmediakeytimestamp_;
-  int attachmenttype_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr note_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr token_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr attachmentmimetype_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr attachmentmediakey_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr attachmentfilesha256_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr attachmentfileencsha256_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr attachmentdirectpath_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr attachmentjpegthumbnail_;
+    int64_t attachmentmediakeytimestamp_;
+    int attachmenttype_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -6003,7 +6094,7 @@ class ContactMessage final :
  public:
   inline ContactMessage() : ContactMessage(nullptr) {}
   ~ContactMessage() override;
-  explicit constexpr ContactMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR ContactMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   ContactMessage(const ContactMessage& from);
   ContactMessage(ContactMessage&& from) noexcept
@@ -6060,7 +6151,12 @@ class ContactMessage final :
   }
   inline void Swap(ContactMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -6074,34 +6170,34 @@ class ContactMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline ContactMessage* New() const final {
-    return new ContactMessage();
-  }
-
-  ContactMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  ContactMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<ContactMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const ContactMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const ContactMessage& from);
+  void MergeFrom( const ContactMessage& from) {
+    ContactMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(ContactMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.ContactMessage";
@@ -6109,9 +6205,6 @@ class ContactMessage final :
   protected:
   explicit ContactMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -6138,7 +6231,7 @@ class ContactMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_displayname(ArgT0&& arg0, ArgT... args);
   std::string* mutable_displayname();
-  PROTOBUF_MUST_USE_RESULT std::string* release_displayname();
+  PROTOBUF_NODISCARD std::string* release_displayname();
   void set_allocated_displayname(std::string* displayname);
   private:
   const std::string& _internal_displayname() const;
@@ -6156,7 +6249,7 @@ class ContactMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_vcard(ArgT0&& arg0, ArgT... args);
   std::string* mutable_vcard();
-  PROTOBUF_MUST_USE_RESULT std::string* release_vcard();
+  PROTOBUF_NODISCARD std::string* release_vcard();
   void set_allocated_vcard(std::string* vcard);
   private:
   const std::string& _internal_vcard() const;
@@ -6171,7 +6264,7 @@ class ContactMessage final :
   public:
   void clear_contextinfo();
   const ::proto::ContextInfo& contextinfo() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ContextInfo* release_contextinfo();
+  PROTOBUF_NODISCARD ::proto::ContextInfo* release_contextinfo();
   ::proto::ContextInfo* mutable_contextinfo();
   void set_allocated_contextinfo(::proto::ContextInfo* contextinfo);
   private:
@@ -6189,11 +6282,14 @@ class ContactMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr displayname_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr vcard_;
-  ::proto::ContextInfo* contextinfo_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr displayname_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr vcard_;
+    ::proto::ContextInfo* contextinfo_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -6203,7 +6299,7 @@ class LocationMessage final :
  public:
   inline LocationMessage() : LocationMessage(nullptr) {}
   ~LocationMessage() override;
-  explicit constexpr LocationMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR LocationMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   LocationMessage(const LocationMessage& from);
   LocationMessage(LocationMessage&& from) noexcept
@@ -6260,7 +6356,12 @@ class LocationMessage final :
   }
   inline void Swap(LocationMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -6274,34 +6375,34 @@ class LocationMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline LocationMessage* New() const final {
-    return new LocationMessage();
-  }
-
-  LocationMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  LocationMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<LocationMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const LocationMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const LocationMessage& from);
+  void MergeFrom( const LocationMessage& from) {
+    LocationMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(LocationMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.LocationMessage";
@@ -6309,9 +6410,6 @@ class LocationMessage final :
   protected:
   explicit LocationMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -6347,7 +6445,7 @@ class LocationMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_name(ArgT0&& arg0, ArgT... args);
   std::string* mutable_name();
-  PROTOBUF_MUST_USE_RESULT std::string* release_name();
+  PROTOBUF_NODISCARD std::string* release_name();
   void set_allocated_name(std::string* name);
   private:
   const std::string& _internal_name() const;
@@ -6365,7 +6463,7 @@ class LocationMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_address(ArgT0&& arg0, ArgT... args);
   std::string* mutable_address();
-  PROTOBUF_MUST_USE_RESULT std::string* release_address();
+  PROTOBUF_NODISCARD std::string* release_address();
   void set_allocated_address(std::string* address);
   private:
   const std::string& _internal_address() const;
@@ -6383,7 +6481,7 @@ class LocationMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_url(ArgT0&& arg0, ArgT... args);
   std::string* mutable_url();
-  PROTOBUF_MUST_USE_RESULT std::string* release_url();
+  PROTOBUF_NODISCARD std::string* release_url();
   void set_allocated_url(std::string* url);
   private:
   const std::string& _internal_url() const;
@@ -6401,7 +6499,7 @@ class LocationMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_comment(ArgT0&& arg0, ArgT... args);
   std::string* mutable_comment();
-  PROTOBUF_MUST_USE_RESULT std::string* release_comment();
+  PROTOBUF_NODISCARD std::string* release_comment();
   void set_allocated_comment(std::string* comment);
   private:
   const std::string& _internal_comment() const;
@@ -6419,7 +6517,7 @@ class LocationMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_jpegthumbnail(ArgT0&& arg0, ArgT... args);
   std::string* mutable_jpegthumbnail();
-  PROTOBUF_MUST_USE_RESULT std::string* release_jpegthumbnail();
+  PROTOBUF_NODISCARD std::string* release_jpegthumbnail();
   void set_allocated_jpegthumbnail(std::string* jpegthumbnail);
   private:
   const std::string& _internal_jpegthumbnail() const;
@@ -6434,7 +6532,7 @@ class LocationMessage final :
   public:
   void clear_contextinfo();
   const ::proto::ContextInfo& contextinfo() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ContextInfo* release_contextinfo();
+  PROTOBUF_NODISCARD ::proto::ContextInfo* release_contextinfo();
   ::proto::ContextInfo* mutable_contextinfo();
   void set_allocated_contextinfo(::proto::ContextInfo* contextinfo);
   private:
@@ -6490,11 +6588,11 @@ class LocationMessage final :
   bool _internal_has_accuracyinmeters() const;
   public:
   void clear_accuracyinmeters();
-  ::PROTOBUF_NAMESPACE_ID::uint32 accuracyinmeters() const;
-  void set_accuracyinmeters(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t accuracyinmeters() const;
+  void set_accuracyinmeters(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_accuracyinmeters() const;
-  void _internal_set_accuracyinmeters(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_accuracyinmeters() const;
+  void _internal_set_accuracyinmeters(uint32_t value);
   public:
 
   // optional float speedInMps = 8;
@@ -6516,11 +6614,11 @@ class LocationMessage final :
   bool _internal_has_degreesclockwisefrommagneticnorth() const;
   public:
   void clear_degreesclockwisefrommagneticnorth();
-  ::PROTOBUF_NAMESPACE_ID::uint32 degreesclockwisefrommagneticnorth() const;
-  void set_degreesclockwisefrommagneticnorth(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t degreesclockwisefrommagneticnorth() const;
+  void set_degreesclockwisefrommagneticnorth(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_degreesclockwisefrommagneticnorth() const;
-  void _internal_set_degreesclockwisefrommagneticnorth(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_degreesclockwisefrommagneticnorth() const;
+  void _internal_set_degreesclockwisefrommagneticnorth(uint32_t value);
   public:
 
   // @@protoc_insertion_point(class_scope:proto.LocationMessage)
@@ -6530,20 +6628,23 @@ class LocationMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr address_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr url_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr comment_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr jpegthumbnail_;
-  ::proto::ContextInfo* contextinfo_;
-  double degreeslatitude_;
-  double degreeslongitude_;
-  bool islive_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 accuracyinmeters_;
-  float speedinmps_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 degreesclockwisefrommagneticnorth_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr name_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr address_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr url_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr comment_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr jpegthumbnail_;
+    ::proto::ContextInfo* contextinfo_;
+    double degreeslatitude_;
+    double degreeslongitude_;
+    bool islive_;
+    uint32_t accuracyinmeters_;
+    float speedinmps_;
+    uint32_t degreesclockwisefrommagneticnorth_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -6553,7 +6654,7 @@ class ExtendedTextMessage final :
  public:
   inline ExtendedTextMessage() : ExtendedTextMessage(nullptr) {}
   ~ExtendedTextMessage() override;
-  explicit constexpr ExtendedTextMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR ExtendedTextMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   ExtendedTextMessage(const ExtendedTextMessage& from);
   ExtendedTextMessage(ExtendedTextMessage&& from) noexcept
@@ -6610,7 +6711,12 @@ class ExtendedTextMessage final :
   }
   inline void Swap(ExtendedTextMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -6624,34 +6730,34 @@ class ExtendedTextMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline ExtendedTextMessage* New() const final {
-    return new ExtendedTextMessage();
-  }
-
-  ExtendedTextMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  ExtendedTextMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<ExtendedTextMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const ExtendedTextMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const ExtendedTextMessage& from);
+  void MergeFrom( const ExtendedTextMessage& from) {
+    ExtendedTextMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(ExtendedTextMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.ExtendedTextMessage";
@@ -6659,9 +6765,6 @@ class ExtendedTextMessage final :
   protected:
   explicit ExtendedTextMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -6765,7 +6868,7 @@ class ExtendedTextMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_text(ArgT0&& arg0, ArgT... args);
   std::string* mutable_text();
-  PROTOBUF_MUST_USE_RESULT std::string* release_text();
+  PROTOBUF_NODISCARD std::string* release_text();
   void set_allocated_text(std::string* text);
   private:
   const std::string& _internal_text() const;
@@ -6783,7 +6886,7 @@ class ExtendedTextMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_matchedtext(ArgT0&& arg0, ArgT... args);
   std::string* mutable_matchedtext();
-  PROTOBUF_MUST_USE_RESULT std::string* release_matchedtext();
+  PROTOBUF_NODISCARD std::string* release_matchedtext();
   void set_allocated_matchedtext(std::string* matchedtext);
   private:
   const std::string& _internal_matchedtext() const;
@@ -6801,7 +6904,7 @@ class ExtendedTextMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_canonicalurl(ArgT0&& arg0, ArgT... args);
   std::string* mutable_canonicalurl();
-  PROTOBUF_MUST_USE_RESULT std::string* release_canonicalurl();
+  PROTOBUF_NODISCARD std::string* release_canonicalurl();
   void set_allocated_canonicalurl(std::string* canonicalurl);
   private:
   const std::string& _internal_canonicalurl() const;
@@ -6819,7 +6922,7 @@ class ExtendedTextMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_description(ArgT0&& arg0, ArgT... args);
   std::string* mutable_description();
-  PROTOBUF_MUST_USE_RESULT std::string* release_description();
+  PROTOBUF_NODISCARD std::string* release_description();
   void set_allocated_description(std::string* description);
   private:
   const std::string& _internal_description() const;
@@ -6837,7 +6940,7 @@ class ExtendedTextMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_title(ArgT0&& arg0, ArgT... args);
   std::string* mutable_title();
-  PROTOBUF_MUST_USE_RESULT std::string* release_title();
+  PROTOBUF_NODISCARD std::string* release_title();
   void set_allocated_title(std::string* title);
   private:
   const std::string& _internal_title() const;
@@ -6855,7 +6958,7 @@ class ExtendedTextMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_jpegthumbnail(ArgT0&& arg0, ArgT... args);
   std::string* mutable_jpegthumbnail();
-  PROTOBUF_MUST_USE_RESULT std::string* release_jpegthumbnail();
+  PROTOBUF_NODISCARD std::string* release_jpegthumbnail();
   void set_allocated_jpegthumbnail(std::string* jpegthumbnail);
   private:
   const std::string& _internal_jpegthumbnail() const;
@@ -6870,7 +6973,7 @@ class ExtendedTextMessage final :
   public:
   void clear_contextinfo();
   const ::proto::ContextInfo& contextinfo() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ContextInfo* release_contextinfo();
+  PROTOBUF_NODISCARD ::proto::ContextInfo* release_contextinfo();
   ::proto::ContextInfo* mutable_contextinfo();
   void set_allocated_contextinfo(::proto::ContextInfo* contextinfo);
   private:
@@ -6887,11 +6990,11 @@ class ExtendedTextMessage final :
   bool _internal_has_textargb() const;
   public:
   void clear_textargb();
-  ::PROTOBUF_NAMESPACE_ID::uint32 textargb() const;
-  void set_textargb(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t textargb() const;
+  void set_textargb(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_textargb() const;
-  void _internal_set_textargb(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_textargb() const;
+  void _internal_set_textargb(uint32_t value);
   public:
 
   // optional fixed32 backgroundArgb = 8;
@@ -6900,11 +7003,11 @@ class ExtendedTextMessage final :
   bool _internal_has_backgroundargb() const;
   public:
   void clear_backgroundargb();
-  ::PROTOBUF_NAMESPACE_ID::uint32 backgroundargb() const;
-  void set_backgroundargb(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t backgroundargb() const;
+  void set_backgroundargb(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_backgroundargb() const;
-  void _internal_set_backgroundargb(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_backgroundargb() const;
+  void _internal_set_backgroundargb(uint32_t value);
   public:
 
   // optional .proto.ExtendedTextMessage.ExtendedTextMessageFontType font = 9;
@@ -6953,20 +7056,23 @@ class ExtendedTextMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr text_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr matchedtext_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr canonicalurl_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr description_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr title_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr jpegthumbnail_;
-  ::proto::ContextInfo* contextinfo_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 textargb_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 backgroundargb_;
-  int font_;
-  int previewtype_;
-  bool donotplayinline_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr text_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr matchedtext_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr canonicalurl_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr description_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr title_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr jpegthumbnail_;
+    ::proto::ContextInfo* contextinfo_;
+    uint32_t textargb_;
+    uint32_t backgroundargb_;
+    int font_;
+    int previewtype_;
+    bool donotplayinline_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -6976,7 +7082,7 @@ class DocumentMessage final :
  public:
   inline DocumentMessage() : DocumentMessage(nullptr) {}
   ~DocumentMessage() override;
-  explicit constexpr DocumentMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR DocumentMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   DocumentMessage(const DocumentMessage& from);
   DocumentMessage(DocumentMessage&& from) noexcept
@@ -7033,7 +7139,12 @@ class DocumentMessage final :
   }
   inline void Swap(DocumentMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -7047,34 +7158,34 @@ class DocumentMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline DocumentMessage* New() const final {
-    return new DocumentMessage();
-  }
-
-  DocumentMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  DocumentMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<DocumentMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const DocumentMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const DocumentMessage& from);
+  void MergeFrom( const DocumentMessage& from) {
+    DocumentMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(DocumentMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.DocumentMessage";
@@ -7082,9 +7193,6 @@ class DocumentMessage final :
   protected:
   explicit DocumentMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -7127,7 +7235,7 @@ class DocumentMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_url(ArgT0&& arg0, ArgT... args);
   std::string* mutable_url();
-  PROTOBUF_MUST_USE_RESULT std::string* release_url();
+  PROTOBUF_NODISCARD std::string* release_url();
   void set_allocated_url(std::string* url);
   private:
   const std::string& _internal_url() const;
@@ -7145,7 +7253,7 @@ class DocumentMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_mimetype(ArgT0&& arg0, ArgT... args);
   std::string* mutable_mimetype();
-  PROTOBUF_MUST_USE_RESULT std::string* release_mimetype();
+  PROTOBUF_NODISCARD std::string* release_mimetype();
   void set_allocated_mimetype(std::string* mimetype);
   private:
   const std::string& _internal_mimetype() const;
@@ -7163,7 +7271,7 @@ class DocumentMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_title(ArgT0&& arg0, ArgT... args);
   std::string* mutable_title();
-  PROTOBUF_MUST_USE_RESULT std::string* release_title();
+  PROTOBUF_NODISCARD std::string* release_title();
   void set_allocated_title(std::string* title);
   private:
   const std::string& _internal_title() const;
@@ -7181,7 +7289,7 @@ class DocumentMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_filesha256(ArgT0&& arg0, ArgT... args);
   std::string* mutable_filesha256();
-  PROTOBUF_MUST_USE_RESULT std::string* release_filesha256();
+  PROTOBUF_NODISCARD std::string* release_filesha256();
   void set_allocated_filesha256(std::string* filesha256);
   private:
   const std::string& _internal_filesha256() const;
@@ -7199,7 +7307,7 @@ class DocumentMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_mediakey(ArgT0&& arg0, ArgT... args);
   std::string* mutable_mediakey();
-  PROTOBUF_MUST_USE_RESULT std::string* release_mediakey();
+  PROTOBUF_NODISCARD std::string* release_mediakey();
   void set_allocated_mediakey(std::string* mediakey);
   private:
   const std::string& _internal_mediakey() const;
@@ -7217,7 +7325,7 @@ class DocumentMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_filename(ArgT0&& arg0, ArgT... args);
   std::string* mutable_filename();
-  PROTOBUF_MUST_USE_RESULT std::string* release_filename();
+  PROTOBUF_NODISCARD std::string* release_filename();
   void set_allocated_filename(std::string* filename);
   private:
   const std::string& _internal_filename() const;
@@ -7235,7 +7343,7 @@ class DocumentMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_fileencsha256(ArgT0&& arg0, ArgT... args);
   std::string* mutable_fileencsha256();
-  PROTOBUF_MUST_USE_RESULT std::string* release_fileencsha256();
+  PROTOBUF_NODISCARD std::string* release_fileencsha256();
   void set_allocated_fileencsha256(std::string* fileencsha256);
   private:
   const std::string& _internal_fileencsha256() const;
@@ -7253,7 +7361,7 @@ class DocumentMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_directpath(ArgT0&& arg0, ArgT... args);
   std::string* mutable_directpath();
-  PROTOBUF_MUST_USE_RESULT std::string* release_directpath();
+  PROTOBUF_NODISCARD std::string* release_directpath();
   void set_allocated_directpath(std::string* directpath);
   private:
   const std::string& _internal_directpath() const;
@@ -7271,7 +7379,7 @@ class DocumentMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_thumbnaildirectpath(ArgT0&& arg0, ArgT... args);
   std::string* mutable_thumbnaildirectpath();
-  PROTOBUF_MUST_USE_RESULT std::string* release_thumbnaildirectpath();
+  PROTOBUF_NODISCARD std::string* release_thumbnaildirectpath();
   void set_allocated_thumbnaildirectpath(std::string* thumbnaildirectpath);
   private:
   const std::string& _internal_thumbnaildirectpath() const;
@@ -7289,7 +7397,7 @@ class DocumentMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_thumbnailsha256(ArgT0&& arg0, ArgT... args);
   std::string* mutable_thumbnailsha256();
-  PROTOBUF_MUST_USE_RESULT std::string* release_thumbnailsha256();
+  PROTOBUF_NODISCARD std::string* release_thumbnailsha256();
   void set_allocated_thumbnailsha256(std::string* thumbnailsha256);
   private:
   const std::string& _internal_thumbnailsha256() const;
@@ -7307,7 +7415,7 @@ class DocumentMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_thumbnailencsha256(ArgT0&& arg0, ArgT... args);
   std::string* mutable_thumbnailencsha256();
-  PROTOBUF_MUST_USE_RESULT std::string* release_thumbnailencsha256();
+  PROTOBUF_NODISCARD std::string* release_thumbnailencsha256();
   void set_allocated_thumbnailencsha256(std::string* thumbnailencsha256);
   private:
   const std::string& _internal_thumbnailencsha256() const;
@@ -7325,7 +7433,7 @@ class DocumentMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_jpegthumbnail(ArgT0&& arg0, ArgT... args);
   std::string* mutable_jpegthumbnail();
-  PROTOBUF_MUST_USE_RESULT std::string* release_jpegthumbnail();
+  PROTOBUF_NODISCARD std::string* release_jpegthumbnail();
   void set_allocated_jpegthumbnail(std::string* jpegthumbnail);
   private:
   const std::string& _internal_jpegthumbnail() const;
@@ -7340,7 +7448,7 @@ class DocumentMessage final :
   public:
   void clear_contextinfo();
   const ::proto::ContextInfo& contextinfo() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ContextInfo* release_contextinfo();
+  PROTOBUF_NODISCARD ::proto::ContextInfo* release_contextinfo();
   ::proto::ContextInfo* mutable_contextinfo();
   void set_allocated_contextinfo(::proto::ContextInfo* contextinfo);
   private:
@@ -7357,11 +7465,11 @@ class DocumentMessage final :
   bool _internal_has_filelength() const;
   public:
   void clear_filelength();
-  ::PROTOBUF_NAMESPACE_ID::uint64 filelength() const;
-  void set_filelength(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t filelength() const;
+  void set_filelength(uint64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint64 _internal_filelength() const;
-  void _internal_set_filelength(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t _internal_filelength() const;
+  void _internal_set_filelength(uint64_t value);
   public:
 
   // optional uint32 pageCount = 6;
@@ -7370,11 +7478,11 @@ class DocumentMessage final :
   bool _internal_has_pagecount() const;
   public:
   void clear_pagecount();
-  ::PROTOBUF_NAMESPACE_ID::uint32 pagecount() const;
-  void set_pagecount(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t pagecount() const;
+  void set_pagecount(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_pagecount() const;
-  void _internal_set_pagecount(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_pagecount() const;
+  void _internal_set_pagecount(uint32_t value);
   public:
 
   // optional bool contactVcard = 12;
@@ -7396,11 +7504,11 @@ class DocumentMessage final :
   bool _internal_has_mediakeytimestamp() const;
   public:
   void clear_mediakeytimestamp();
-  ::PROTOBUF_NAMESPACE_ID::int64 mediakeytimestamp() const;
-  void set_mediakeytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t mediakeytimestamp() const;
+  void set_mediakeytimestamp(int64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::int64 _internal_mediakeytimestamp() const;
-  void _internal_set_mediakeytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t _internal_mediakeytimestamp() const;
+  void _internal_set_mediakeytimestamp(int64_t value);
   public:
 
   // optional uint32 thumbnailHeight = 18;
@@ -7409,11 +7517,11 @@ class DocumentMessage final :
   bool _internal_has_thumbnailheight() const;
   public:
   void clear_thumbnailheight();
-  ::PROTOBUF_NAMESPACE_ID::uint32 thumbnailheight() const;
-  void set_thumbnailheight(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t thumbnailheight() const;
+  void set_thumbnailheight(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_thumbnailheight() const;
-  void _internal_set_thumbnailheight(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_thumbnailheight() const;
+  void _internal_set_thumbnailheight(uint32_t value);
   public:
 
   // optional uint32 thumbnailWidth = 19;
@@ -7422,11 +7530,11 @@ class DocumentMessage final :
   bool _internal_has_thumbnailwidth() const;
   public:
   void clear_thumbnailwidth();
-  ::PROTOBUF_NAMESPACE_ID::uint32 thumbnailwidth() const;
-  void set_thumbnailwidth(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t thumbnailwidth() const;
+  void set_thumbnailwidth(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_thumbnailwidth() const;
-  void _internal_set_thumbnailwidth(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_thumbnailwidth() const;
+  void _internal_set_thumbnailwidth(uint32_t value);
   public:
 
   // @@protoc_insertion_point(class_scope:proto.DocumentMessage)
@@ -7436,27 +7544,30 @@ class DocumentMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr url_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr mimetype_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr title_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr filesha256_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr mediakey_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr filename_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr fileencsha256_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr directpath_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr thumbnaildirectpath_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr thumbnailsha256_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr thumbnailencsha256_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr jpegthumbnail_;
-  ::proto::ContextInfo* contextinfo_;
-  ::PROTOBUF_NAMESPACE_ID::uint64 filelength_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 pagecount_;
-  bool contactvcard_;
-  ::PROTOBUF_NAMESPACE_ID::int64 mediakeytimestamp_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 thumbnailheight_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 thumbnailwidth_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr url_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr mimetype_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr title_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr filesha256_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr mediakey_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr filename_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr fileencsha256_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr directpath_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr thumbnaildirectpath_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr thumbnailsha256_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr thumbnailencsha256_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr jpegthumbnail_;
+    ::proto::ContextInfo* contextinfo_;
+    uint64_t filelength_;
+    uint32_t pagecount_;
+    bool contactvcard_;
+    int64_t mediakeytimestamp_;
+    uint32_t thumbnailheight_;
+    uint32_t thumbnailwidth_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -7466,7 +7577,7 @@ class AudioMessage final :
  public:
   inline AudioMessage() : AudioMessage(nullptr) {}
   ~AudioMessage() override;
-  explicit constexpr AudioMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR AudioMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   AudioMessage(const AudioMessage& from);
   AudioMessage(AudioMessage&& from) noexcept
@@ -7523,7 +7634,12 @@ class AudioMessage final :
   }
   inline void Swap(AudioMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -7537,34 +7653,34 @@ class AudioMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline AudioMessage* New() const final {
-    return new AudioMessage();
-  }
-
-  AudioMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  AudioMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<AudioMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const AudioMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const AudioMessage& from);
+  void MergeFrom( const AudioMessage& from) {
+    AudioMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(AudioMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.AudioMessage";
@@ -7572,9 +7688,6 @@ class AudioMessage final :
   protected:
   explicit AudioMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -7610,7 +7723,7 @@ class AudioMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_url(ArgT0&& arg0, ArgT... args);
   std::string* mutable_url();
-  PROTOBUF_MUST_USE_RESULT std::string* release_url();
+  PROTOBUF_NODISCARD std::string* release_url();
   void set_allocated_url(std::string* url);
   private:
   const std::string& _internal_url() const;
@@ -7628,7 +7741,7 @@ class AudioMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_mimetype(ArgT0&& arg0, ArgT... args);
   std::string* mutable_mimetype();
-  PROTOBUF_MUST_USE_RESULT std::string* release_mimetype();
+  PROTOBUF_NODISCARD std::string* release_mimetype();
   void set_allocated_mimetype(std::string* mimetype);
   private:
   const std::string& _internal_mimetype() const;
@@ -7646,7 +7759,7 @@ class AudioMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_filesha256(ArgT0&& arg0, ArgT... args);
   std::string* mutable_filesha256();
-  PROTOBUF_MUST_USE_RESULT std::string* release_filesha256();
+  PROTOBUF_NODISCARD std::string* release_filesha256();
   void set_allocated_filesha256(std::string* filesha256);
   private:
   const std::string& _internal_filesha256() const;
@@ -7664,7 +7777,7 @@ class AudioMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_mediakey(ArgT0&& arg0, ArgT... args);
   std::string* mutable_mediakey();
-  PROTOBUF_MUST_USE_RESULT std::string* release_mediakey();
+  PROTOBUF_NODISCARD std::string* release_mediakey();
   void set_allocated_mediakey(std::string* mediakey);
   private:
   const std::string& _internal_mediakey() const;
@@ -7682,7 +7795,7 @@ class AudioMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_fileencsha256(ArgT0&& arg0, ArgT... args);
   std::string* mutable_fileencsha256();
-  PROTOBUF_MUST_USE_RESULT std::string* release_fileencsha256();
+  PROTOBUF_NODISCARD std::string* release_fileencsha256();
   void set_allocated_fileencsha256(std::string* fileencsha256);
   private:
   const std::string& _internal_fileencsha256() const;
@@ -7700,7 +7813,7 @@ class AudioMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_directpath(ArgT0&& arg0, ArgT... args);
   std::string* mutable_directpath();
-  PROTOBUF_MUST_USE_RESULT std::string* release_directpath();
+  PROTOBUF_NODISCARD std::string* release_directpath();
   void set_allocated_directpath(std::string* directpath);
   private:
   const std::string& _internal_directpath() const;
@@ -7718,7 +7831,7 @@ class AudioMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_streamingsidecar(ArgT0&& arg0, ArgT... args);
   std::string* mutable_streamingsidecar();
-  PROTOBUF_MUST_USE_RESULT std::string* release_streamingsidecar();
+  PROTOBUF_NODISCARD std::string* release_streamingsidecar();
   void set_allocated_streamingsidecar(std::string* streamingsidecar);
   private:
   const std::string& _internal_streamingsidecar() const;
@@ -7733,7 +7846,7 @@ class AudioMessage final :
   public:
   void clear_contextinfo();
   const ::proto::ContextInfo& contextinfo() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ContextInfo* release_contextinfo();
+  PROTOBUF_NODISCARD ::proto::ContextInfo* release_contextinfo();
   ::proto::ContextInfo* mutable_contextinfo();
   void set_allocated_contextinfo(::proto::ContextInfo* contextinfo);
   private:
@@ -7750,11 +7863,11 @@ class AudioMessage final :
   bool _internal_has_filelength() const;
   public:
   void clear_filelength();
-  ::PROTOBUF_NAMESPACE_ID::uint64 filelength() const;
-  void set_filelength(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t filelength() const;
+  void set_filelength(uint64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint64 _internal_filelength() const;
-  void _internal_set_filelength(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t _internal_filelength() const;
+  void _internal_set_filelength(uint64_t value);
   public:
 
   // optional uint32 seconds = 5;
@@ -7763,11 +7876,11 @@ class AudioMessage final :
   bool _internal_has_seconds() const;
   public:
   void clear_seconds();
-  ::PROTOBUF_NAMESPACE_ID::uint32 seconds() const;
-  void set_seconds(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t seconds() const;
+  void set_seconds(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_seconds() const;
-  void _internal_set_seconds(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_seconds() const;
+  void _internal_set_seconds(uint32_t value);
   public:
 
   // optional bool ptt = 6;
@@ -7789,11 +7902,11 @@ class AudioMessage final :
   bool _internal_has_mediakeytimestamp() const;
   public:
   void clear_mediakeytimestamp();
-  ::PROTOBUF_NAMESPACE_ID::int64 mediakeytimestamp() const;
-  void set_mediakeytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t mediakeytimestamp() const;
+  void set_mediakeytimestamp(int64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::int64 _internal_mediakeytimestamp() const;
-  void _internal_set_mediakeytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t _internal_mediakeytimestamp() const;
+  void _internal_set_mediakeytimestamp(int64_t value);
   public:
 
   // @@protoc_insertion_point(class_scope:proto.AudioMessage)
@@ -7803,20 +7916,23 @@ class AudioMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr url_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr mimetype_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr filesha256_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr mediakey_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr fileencsha256_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr directpath_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr streamingsidecar_;
-  ::proto::ContextInfo* contextinfo_;
-  ::PROTOBUF_NAMESPACE_ID::uint64 filelength_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 seconds_;
-  bool ptt_;
-  ::PROTOBUF_NAMESPACE_ID::int64 mediakeytimestamp_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr url_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr mimetype_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr filesha256_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr mediakey_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr fileencsha256_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr directpath_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr streamingsidecar_;
+    ::proto::ContextInfo* contextinfo_;
+    uint64_t filelength_;
+    uint32_t seconds_;
+    bool ptt_;
+    int64_t mediakeytimestamp_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -7826,7 +7942,7 @@ class VideoMessage final :
  public:
   inline VideoMessage() : VideoMessage(nullptr) {}
   ~VideoMessage() override;
-  explicit constexpr VideoMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR VideoMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   VideoMessage(const VideoMessage& from);
   VideoMessage(VideoMessage&& from) noexcept
@@ -7883,7 +7999,12 @@ class VideoMessage final :
   }
   inline void Swap(VideoMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -7897,34 +8018,34 @@ class VideoMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline VideoMessage* New() const final {
-    return new VideoMessage();
-  }
-
-  VideoMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  VideoMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<VideoMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const VideoMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const VideoMessage& from);
+  void MergeFrom( const VideoMessage& from) {
+    VideoMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(VideoMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.VideoMessage";
@@ -7932,9 +8053,6 @@ class VideoMessage final :
   protected:
   explicit VideoMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -8030,7 +8148,7 @@ class VideoMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_url(ArgT0&& arg0, ArgT... args);
   std::string* mutable_url();
-  PROTOBUF_MUST_USE_RESULT std::string* release_url();
+  PROTOBUF_NODISCARD std::string* release_url();
   void set_allocated_url(std::string* url);
   private:
   const std::string& _internal_url() const;
@@ -8048,7 +8166,7 @@ class VideoMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_mimetype(ArgT0&& arg0, ArgT... args);
   std::string* mutable_mimetype();
-  PROTOBUF_MUST_USE_RESULT std::string* release_mimetype();
+  PROTOBUF_NODISCARD std::string* release_mimetype();
   void set_allocated_mimetype(std::string* mimetype);
   private:
   const std::string& _internal_mimetype() const;
@@ -8066,7 +8184,7 @@ class VideoMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_filesha256(ArgT0&& arg0, ArgT... args);
   std::string* mutable_filesha256();
-  PROTOBUF_MUST_USE_RESULT std::string* release_filesha256();
+  PROTOBUF_NODISCARD std::string* release_filesha256();
   void set_allocated_filesha256(std::string* filesha256);
   private:
   const std::string& _internal_filesha256() const;
@@ -8084,7 +8202,7 @@ class VideoMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_mediakey(ArgT0&& arg0, ArgT... args);
   std::string* mutable_mediakey();
-  PROTOBUF_MUST_USE_RESULT std::string* release_mediakey();
+  PROTOBUF_NODISCARD std::string* release_mediakey();
   void set_allocated_mediakey(std::string* mediakey);
   private:
   const std::string& _internal_mediakey() const;
@@ -8102,7 +8220,7 @@ class VideoMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_caption(ArgT0&& arg0, ArgT... args);
   std::string* mutable_caption();
-  PROTOBUF_MUST_USE_RESULT std::string* release_caption();
+  PROTOBUF_NODISCARD std::string* release_caption();
   void set_allocated_caption(std::string* caption);
   private:
   const std::string& _internal_caption() const;
@@ -8120,7 +8238,7 @@ class VideoMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_fileencsha256(ArgT0&& arg0, ArgT... args);
   std::string* mutable_fileencsha256();
-  PROTOBUF_MUST_USE_RESULT std::string* release_fileencsha256();
+  PROTOBUF_NODISCARD std::string* release_fileencsha256();
   void set_allocated_fileencsha256(std::string* fileencsha256);
   private:
   const std::string& _internal_fileencsha256() const;
@@ -8138,7 +8256,7 @@ class VideoMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_directpath(ArgT0&& arg0, ArgT... args);
   std::string* mutable_directpath();
-  PROTOBUF_MUST_USE_RESULT std::string* release_directpath();
+  PROTOBUF_NODISCARD std::string* release_directpath();
   void set_allocated_directpath(std::string* directpath);
   private:
   const std::string& _internal_directpath() const;
@@ -8156,7 +8274,7 @@ class VideoMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_jpegthumbnail(ArgT0&& arg0, ArgT... args);
   std::string* mutable_jpegthumbnail();
-  PROTOBUF_MUST_USE_RESULT std::string* release_jpegthumbnail();
+  PROTOBUF_NODISCARD std::string* release_jpegthumbnail();
   void set_allocated_jpegthumbnail(std::string* jpegthumbnail);
   private:
   const std::string& _internal_jpegthumbnail() const;
@@ -8174,7 +8292,7 @@ class VideoMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_streamingsidecar(ArgT0&& arg0, ArgT... args);
   std::string* mutable_streamingsidecar();
-  PROTOBUF_MUST_USE_RESULT std::string* release_streamingsidecar();
+  PROTOBUF_NODISCARD std::string* release_streamingsidecar();
   void set_allocated_streamingsidecar(std::string* streamingsidecar);
   private:
   const std::string& _internal_streamingsidecar() const;
@@ -8192,7 +8310,7 @@ class VideoMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_thumbnaildirectpath(ArgT0&& arg0, ArgT... args);
   std::string* mutable_thumbnaildirectpath();
-  PROTOBUF_MUST_USE_RESULT std::string* release_thumbnaildirectpath();
+  PROTOBUF_NODISCARD std::string* release_thumbnaildirectpath();
   void set_allocated_thumbnaildirectpath(std::string* thumbnaildirectpath);
   private:
   const std::string& _internal_thumbnaildirectpath() const;
@@ -8210,7 +8328,7 @@ class VideoMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_thumbnailsha256(ArgT0&& arg0, ArgT... args);
   std::string* mutable_thumbnailsha256();
-  PROTOBUF_MUST_USE_RESULT std::string* release_thumbnailsha256();
+  PROTOBUF_NODISCARD std::string* release_thumbnailsha256();
   void set_allocated_thumbnailsha256(std::string* thumbnailsha256);
   private:
   const std::string& _internal_thumbnailsha256() const;
@@ -8228,7 +8346,7 @@ class VideoMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_thumbnailencsha256(ArgT0&& arg0, ArgT... args);
   std::string* mutable_thumbnailencsha256();
-  PROTOBUF_MUST_USE_RESULT std::string* release_thumbnailencsha256();
+  PROTOBUF_NODISCARD std::string* release_thumbnailencsha256();
   void set_allocated_thumbnailencsha256(std::string* thumbnailencsha256);
   private:
   const std::string& _internal_thumbnailencsha256() const;
@@ -8243,7 +8361,7 @@ class VideoMessage final :
   public:
   void clear_contextinfo();
   const ::proto::ContextInfo& contextinfo() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ContextInfo* release_contextinfo();
+  PROTOBUF_NODISCARD ::proto::ContextInfo* release_contextinfo();
   ::proto::ContextInfo* mutable_contextinfo();
   void set_allocated_contextinfo(::proto::ContextInfo* contextinfo);
   private:
@@ -8260,11 +8378,11 @@ class VideoMessage final :
   bool _internal_has_filelength() const;
   public:
   void clear_filelength();
-  ::PROTOBUF_NAMESPACE_ID::uint64 filelength() const;
-  void set_filelength(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t filelength() const;
+  void set_filelength(uint64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint64 _internal_filelength() const;
-  void _internal_set_filelength(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t _internal_filelength() const;
+  void _internal_set_filelength(uint64_t value);
   public:
 
   // optional uint32 seconds = 5;
@@ -8273,11 +8391,11 @@ class VideoMessage final :
   bool _internal_has_seconds() const;
   public:
   void clear_seconds();
-  ::PROTOBUF_NAMESPACE_ID::uint32 seconds() const;
-  void set_seconds(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t seconds() const;
+  void set_seconds(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_seconds() const;
-  void _internal_set_seconds(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_seconds() const;
+  void _internal_set_seconds(uint32_t value);
   public:
 
   // optional uint32 height = 9;
@@ -8286,11 +8404,11 @@ class VideoMessage final :
   bool _internal_has_height() const;
   public:
   void clear_height();
-  ::PROTOBUF_NAMESPACE_ID::uint32 height() const;
-  void set_height(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t height() const;
+  void set_height(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_height() const;
-  void _internal_set_height(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_height() const;
+  void _internal_set_height(uint32_t value);
   public:
 
   // optional uint32 width = 10;
@@ -8299,11 +8417,11 @@ class VideoMessage final :
   bool _internal_has_width() const;
   public:
   void clear_width();
-  ::PROTOBUF_NAMESPACE_ID::uint32 width() const;
-  void set_width(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t width() const;
+  void set_width(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_width() const;
-  void _internal_set_width(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_width() const;
+  void _internal_set_width(uint32_t value);
   public:
 
   // optional bool gifPlayback = 8;
@@ -8338,11 +8456,11 @@ class VideoMessage final :
   bool _internal_has_mediakeytimestamp() const;
   public:
   void clear_mediakeytimestamp();
-  ::PROTOBUF_NAMESPACE_ID::int64 mediakeytimestamp() const;
-  void set_mediakeytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t mediakeytimestamp() const;
+  void set_mediakeytimestamp(int64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::int64 _internal_mediakeytimestamp() const;
-  void _internal_set_mediakeytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t _internal_mediakeytimestamp() const;
+  void _internal_set_mediakeytimestamp(int64_t value);
   public:
 
   // optional .proto.VideoMessage.VideoMessageAttribution gifAttribution = 19;
@@ -8365,30 +8483,33 @@ class VideoMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::InteractiveAnnotation > interactiveannotations_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr url_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr mimetype_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr filesha256_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr mediakey_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr caption_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr fileencsha256_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr directpath_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr jpegthumbnail_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr streamingsidecar_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr thumbnaildirectpath_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr thumbnailsha256_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr thumbnailencsha256_;
-  ::proto::ContextInfo* contextinfo_;
-  ::PROTOBUF_NAMESPACE_ID::uint64 filelength_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 seconds_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 height_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 width_;
-  bool gifplayback_;
-  bool viewonce_;
-  ::PROTOBUF_NAMESPACE_ID::int64 mediakeytimestamp_;
-  int gifattribution_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::InteractiveAnnotation > interactiveannotations_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr url_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr mimetype_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr filesha256_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr mediakey_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr caption_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr fileencsha256_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr directpath_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr jpegthumbnail_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr streamingsidecar_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr thumbnaildirectpath_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr thumbnailsha256_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr thumbnailencsha256_;
+    ::proto::ContextInfo* contextinfo_;
+    uint64_t filelength_;
+    uint32_t seconds_;
+    uint32_t height_;
+    uint32_t width_;
+    bool gifplayback_;
+    bool viewonce_;
+    int64_t mediakeytimestamp_;
+    int gifattribution_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -8398,7 +8519,7 @@ class Call final :
  public:
   inline Call() : Call(nullptr) {}
   ~Call() override;
-  explicit constexpr Call(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR Call(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   Call(const Call& from);
   Call(Call&& from) noexcept
@@ -8455,7 +8576,12 @@ class Call final :
   }
   inline void Swap(Call* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -8469,34 +8595,34 @@ class Call final :
 
   // implements Message ----------------------------------------------
 
-  inline Call* New() const final {
-    return new Call();
-  }
-
-  Call* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  Call* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<Call>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const Call& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const Call& from);
+  void MergeFrom( const Call& from) {
+    Call::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(Call* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.Call";
@@ -8504,9 +8630,6 @@ class Call final :
   protected:
   explicit Call(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -8531,7 +8654,7 @@ class Call final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_callkey(ArgT0&& arg0, ArgT... args);
   std::string* mutable_callkey();
-  PROTOBUF_MUST_USE_RESULT std::string* release_callkey();
+  PROTOBUF_NODISCARD std::string* release_callkey();
   void set_allocated_callkey(std::string* callkey);
   private:
   const std::string& _internal_callkey() const;
@@ -8546,9 +8669,12 @@ class Call final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr callkey_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr callkey_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -8558,7 +8684,7 @@ class Chat final :
  public:
   inline Chat() : Chat(nullptr) {}
   ~Chat() override;
-  explicit constexpr Chat(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR Chat(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   Chat(const Chat& from);
   Chat(Chat&& from) noexcept
@@ -8615,7 +8741,12 @@ class Chat final :
   }
   inline void Swap(Chat* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -8629,34 +8760,34 @@ class Chat final :
 
   // implements Message ----------------------------------------------
 
-  inline Chat* New() const final {
-    return new Chat();
-  }
-
-  Chat* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  Chat* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<Chat>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const Chat& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const Chat& from);
+  void MergeFrom( const Chat& from) {
+    Chat::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(Chat* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.Chat";
@@ -8664,9 +8795,6 @@ class Chat final :
   protected:
   explicit Chat(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -8692,7 +8820,7 @@ class Chat final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_displayname(ArgT0&& arg0, ArgT... args);
   std::string* mutable_displayname();
-  PROTOBUF_MUST_USE_RESULT std::string* release_displayname();
+  PROTOBUF_NODISCARD std::string* release_displayname();
   void set_allocated_displayname(std::string* displayname);
   private:
   const std::string& _internal_displayname() const;
@@ -8710,7 +8838,7 @@ class Chat final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_id(ArgT0&& arg0, ArgT... args);
   std::string* mutable_id();
-  PROTOBUF_MUST_USE_RESULT std::string* release_id();
+  PROTOBUF_NODISCARD std::string* release_id();
   void set_allocated_id(std::string* id);
   private:
   const std::string& _internal_id() const;
@@ -8725,10 +8853,13 @@ class Chat final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr displayname_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr id_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr displayname_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr id_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -8738,7 +8869,7 @@ class ProtocolMessage final :
  public:
   inline ProtocolMessage() : ProtocolMessage(nullptr) {}
   ~ProtocolMessage() override;
-  explicit constexpr ProtocolMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR ProtocolMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   ProtocolMessage(const ProtocolMessage& from);
   ProtocolMessage(ProtocolMessage&& from) noexcept
@@ -8795,7 +8926,12 @@ class ProtocolMessage final :
   }
   inline void Swap(ProtocolMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -8809,34 +8945,34 @@ class ProtocolMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline ProtocolMessage* New() const final {
-    return new ProtocolMessage();
-  }
-
-  ProtocolMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  ProtocolMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<ProtocolMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const ProtocolMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const ProtocolMessage& from);
+  void MergeFrom( const ProtocolMessage& from) {
+    ProtocolMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(ProtocolMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.ProtocolMessage";
@@ -8844,9 +8980,6 @@ class ProtocolMessage final :
   protected:
   explicit ProtocolMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -8920,7 +9053,7 @@ class ProtocolMessage final :
   public:
   void clear_key();
   const ::proto::MessageKey& key() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::MessageKey* release_key();
+  PROTOBUF_NODISCARD ::proto::MessageKey* release_key();
   ::proto::MessageKey* mutable_key();
   void set_allocated_key(::proto::MessageKey* key);
   private:
@@ -8938,7 +9071,7 @@ class ProtocolMessage final :
   public:
   void clear_historysyncnotification();
   const ::proto::HistorySyncNotification& historysyncnotification() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::HistorySyncNotification* release_historysyncnotification();
+  PROTOBUF_NODISCARD ::proto::HistorySyncNotification* release_historysyncnotification();
   ::proto::HistorySyncNotification* mutable_historysyncnotification();
   void set_allocated_historysyncnotification(::proto::HistorySyncNotification* historysyncnotification);
   private:
@@ -8956,7 +9089,7 @@ class ProtocolMessage final :
   public:
   void clear_appstatesynckeyshare();
   const ::proto::AppStateSyncKeyShare& appstatesynckeyshare() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::AppStateSyncKeyShare* release_appstatesynckeyshare();
+  PROTOBUF_NODISCARD ::proto::AppStateSyncKeyShare* release_appstatesynckeyshare();
   ::proto::AppStateSyncKeyShare* mutable_appstatesynckeyshare();
   void set_allocated_appstatesynckeyshare(::proto::AppStateSyncKeyShare* appstatesynckeyshare);
   private:
@@ -8974,7 +9107,7 @@ class ProtocolMessage final :
   public:
   void clear_appstatesynckeyrequest();
   const ::proto::AppStateSyncKeyRequest& appstatesynckeyrequest() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::AppStateSyncKeyRequest* release_appstatesynckeyrequest();
+  PROTOBUF_NODISCARD ::proto::AppStateSyncKeyRequest* release_appstatesynckeyrequest();
   ::proto::AppStateSyncKeyRequest* mutable_appstatesynckeyrequest();
   void set_allocated_appstatesynckeyrequest(::proto::AppStateSyncKeyRequest* appstatesynckeyrequest);
   private:
@@ -8992,7 +9125,7 @@ class ProtocolMessage final :
   public:
   void clear_initialsecuritynotificationsettingsync();
   const ::proto::InitialSecurityNotificationSettingSync& initialsecuritynotificationsettingsync() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::InitialSecurityNotificationSettingSync* release_initialsecuritynotificationsettingsync();
+  PROTOBUF_NODISCARD ::proto::InitialSecurityNotificationSettingSync* release_initialsecuritynotificationsettingsync();
   ::proto::InitialSecurityNotificationSettingSync* mutable_initialsecuritynotificationsettingsync();
   void set_allocated_initialsecuritynotificationsettingsync(::proto::InitialSecurityNotificationSettingSync* initialsecuritynotificationsettingsync);
   private:
@@ -9010,7 +9143,7 @@ class ProtocolMessage final :
   public:
   void clear_appstatefatalexceptionnotification();
   const ::proto::AppStateFatalExceptionNotification& appstatefatalexceptionnotification() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::AppStateFatalExceptionNotification* release_appstatefatalexceptionnotification();
+  PROTOBUF_NODISCARD ::proto::AppStateFatalExceptionNotification* release_appstatefatalexceptionnotification();
   ::proto::AppStateFatalExceptionNotification* mutable_appstatefatalexceptionnotification();
   void set_allocated_appstatefatalexceptionnotification(::proto::AppStateFatalExceptionNotification* appstatefatalexceptionnotification);
   private:
@@ -9040,11 +9173,11 @@ class ProtocolMessage final :
   bool _internal_has_ephemeralexpiration() const;
   public:
   void clear_ephemeralexpiration();
-  ::PROTOBUF_NAMESPACE_ID::uint32 ephemeralexpiration() const;
-  void set_ephemeralexpiration(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t ephemeralexpiration() const;
+  void set_ephemeralexpiration(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_ephemeralexpiration() const;
-  void _internal_set_ephemeralexpiration(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_ephemeralexpiration() const;
+  void _internal_set_ephemeralexpiration(uint32_t value);
   public:
 
   // optional int64 ephemeralSettingTimestamp = 5;
@@ -9053,11 +9186,11 @@ class ProtocolMessage final :
   bool _internal_has_ephemeralsettingtimestamp() const;
   public:
   void clear_ephemeralsettingtimestamp();
-  ::PROTOBUF_NAMESPACE_ID::int64 ephemeralsettingtimestamp() const;
-  void set_ephemeralsettingtimestamp(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t ephemeralsettingtimestamp() const;
+  void set_ephemeralsettingtimestamp(int64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::int64 _internal_ephemeralsettingtimestamp() const;
-  void _internal_set_ephemeralsettingtimestamp(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t _internal_ephemeralsettingtimestamp() const;
+  void _internal_set_ephemeralsettingtimestamp(int64_t value);
   public:
 
   // @@protoc_insertion_point(class_scope:proto.ProtocolMessage)
@@ -9067,17 +9200,20 @@ class ProtocolMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::proto::MessageKey* key_;
-  ::proto::HistorySyncNotification* historysyncnotification_;
-  ::proto::AppStateSyncKeyShare* appstatesynckeyshare_;
-  ::proto::AppStateSyncKeyRequest* appstatesynckeyrequest_;
-  ::proto::InitialSecurityNotificationSettingSync* initialsecuritynotificationsettingsync_;
-  ::proto::AppStateFatalExceptionNotification* appstatefatalexceptionnotification_;
-  int type_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 ephemeralexpiration_;
-  ::PROTOBUF_NAMESPACE_ID::int64 ephemeralsettingtimestamp_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::proto::MessageKey* key_;
+    ::proto::HistorySyncNotification* historysyncnotification_;
+    ::proto::AppStateSyncKeyShare* appstatesynckeyshare_;
+    ::proto::AppStateSyncKeyRequest* appstatesynckeyrequest_;
+    ::proto::InitialSecurityNotificationSettingSync* initialsecuritynotificationsettingsync_;
+    ::proto::AppStateFatalExceptionNotification* appstatefatalexceptionnotification_;
+    int type_;
+    uint32_t ephemeralexpiration_;
+    int64_t ephemeralsettingtimestamp_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -9087,7 +9223,7 @@ class HistorySyncNotification final :
  public:
   inline HistorySyncNotification() : HistorySyncNotification(nullptr) {}
   ~HistorySyncNotification() override;
-  explicit constexpr HistorySyncNotification(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR HistorySyncNotification(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   HistorySyncNotification(const HistorySyncNotification& from);
   HistorySyncNotification(HistorySyncNotification&& from) noexcept
@@ -9144,7 +9280,12 @@ class HistorySyncNotification final :
   }
   inline void Swap(HistorySyncNotification* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -9158,34 +9299,34 @@ class HistorySyncNotification final :
 
   // implements Message ----------------------------------------------
 
-  inline HistorySyncNotification* New() const final {
-    return new HistorySyncNotification();
-  }
-
-  HistorySyncNotification* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  HistorySyncNotification* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<HistorySyncNotification>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const HistorySyncNotification& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const HistorySyncNotification& from);
+  void MergeFrom( const HistorySyncNotification& from) {
+    HistorySyncNotification::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(HistorySyncNotification* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.HistorySyncNotification";
@@ -9193,9 +9334,6 @@ class HistorySyncNotification final :
   protected:
   explicit HistorySyncNotification(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -9263,7 +9401,7 @@ class HistorySyncNotification final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_filesha256(ArgT0&& arg0, ArgT... args);
   std::string* mutable_filesha256();
-  PROTOBUF_MUST_USE_RESULT std::string* release_filesha256();
+  PROTOBUF_NODISCARD std::string* release_filesha256();
   void set_allocated_filesha256(std::string* filesha256);
   private:
   const std::string& _internal_filesha256() const;
@@ -9281,7 +9419,7 @@ class HistorySyncNotification final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_mediakey(ArgT0&& arg0, ArgT... args);
   std::string* mutable_mediakey();
-  PROTOBUF_MUST_USE_RESULT std::string* release_mediakey();
+  PROTOBUF_NODISCARD std::string* release_mediakey();
   void set_allocated_mediakey(std::string* mediakey);
   private:
   const std::string& _internal_mediakey() const;
@@ -9299,7 +9437,7 @@ class HistorySyncNotification final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_fileencsha256(ArgT0&& arg0, ArgT... args);
   std::string* mutable_fileencsha256();
-  PROTOBUF_MUST_USE_RESULT std::string* release_fileencsha256();
+  PROTOBUF_NODISCARD std::string* release_fileencsha256();
   void set_allocated_fileencsha256(std::string* fileencsha256);
   private:
   const std::string& _internal_fileencsha256() const;
@@ -9317,7 +9455,7 @@ class HistorySyncNotification final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_directpath(ArgT0&& arg0, ArgT... args);
   std::string* mutable_directpath();
-  PROTOBUF_MUST_USE_RESULT std::string* release_directpath();
+  PROTOBUF_NODISCARD std::string* release_directpath();
   void set_allocated_directpath(std::string* directpath);
   private:
   const std::string& _internal_directpath() const;
@@ -9335,7 +9473,7 @@ class HistorySyncNotification final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_originalmessageid(ArgT0&& arg0, ArgT... args);
   std::string* mutable_originalmessageid();
-  PROTOBUF_MUST_USE_RESULT std::string* release_originalmessageid();
+  PROTOBUF_NODISCARD std::string* release_originalmessageid();
   void set_allocated_originalmessageid(std::string* originalmessageid);
   private:
   const std::string& _internal_originalmessageid() const;
@@ -9349,11 +9487,11 @@ class HistorySyncNotification final :
   bool _internal_has_filelength() const;
   public:
   void clear_filelength();
-  ::PROTOBUF_NAMESPACE_ID::uint64 filelength() const;
-  void set_filelength(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t filelength() const;
+  void set_filelength(uint64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint64 _internal_filelength() const;
-  void _internal_set_filelength(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t _internal_filelength() const;
+  void _internal_set_filelength(uint64_t value);
   public:
 
   // optional .proto.HistorySyncNotification.HistorySyncNotificationHistorySyncType syncType = 6;
@@ -9375,11 +9513,11 @@ class HistorySyncNotification final :
   bool _internal_has_chunkorder() const;
   public:
   void clear_chunkorder();
-  ::PROTOBUF_NAMESPACE_ID::uint32 chunkorder() const;
-  void set_chunkorder(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t chunkorder() const;
+  void set_chunkorder(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_chunkorder() const;
-  void _internal_set_chunkorder(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_chunkorder() const;
+  void _internal_set_chunkorder(uint32_t value);
   public:
 
   // @@protoc_insertion_point(class_scope:proto.HistorySyncNotification)
@@ -9389,16 +9527,19 @@ class HistorySyncNotification final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr filesha256_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr mediakey_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr fileencsha256_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr directpath_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr originalmessageid_;
-  ::PROTOBUF_NAMESPACE_ID::uint64 filelength_;
-  int synctype_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 chunkorder_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr filesha256_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr mediakey_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr fileencsha256_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr directpath_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr originalmessageid_;
+    uint64_t filelength_;
+    int synctype_;
+    uint32_t chunkorder_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -9408,7 +9549,7 @@ class AppStateSyncKey final :
  public:
   inline AppStateSyncKey() : AppStateSyncKey(nullptr) {}
   ~AppStateSyncKey() override;
-  explicit constexpr AppStateSyncKey(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR AppStateSyncKey(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   AppStateSyncKey(const AppStateSyncKey& from);
   AppStateSyncKey(AppStateSyncKey&& from) noexcept
@@ -9465,7 +9606,12 @@ class AppStateSyncKey final :
   }
   inline void Swap(AppStateSyncKey* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -9479,34 +9625,34 @@ class AppStateSyncKey final :
 
   // implements Message ----------------------------------------------
 
-  inline AppStateSyncKey* New() const final {
-    return new AppStateSyncKey();
-  }
-
-  AppStateSyncKey* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  AppStateSyncKey* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<AppStateSyncKey>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const AppStateSyncKey& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const AppStateSyncKey& from);
+  void MergeFrom( const AppStateSyncKey& from) {
+    AppStateSyncKey::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(AppStateSyncKey* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.AppStateSyncKey";
@@ -9514,9 +9660,6 @@ class AppStateSyncKey final :
   protected:
   explicit AppStateSyncKey(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -9539,7 +9682,7 @@ class AppStateSyncKey final :
   public:
   void clear_keyid();
   const ::proto::AppStateSyncKeyId& keyid() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::AppStateSyncKeyId* release_keyid();
+  PROTOBUF_NODISCARD ::proto::AppStateSyncKeyId* release_keyid();
   ::proto::AppStateSyncKeyId* mutable_keyid();
   void set_allocated_keyid(::proto::AppStateSyncKeyId* keyid);
   private:
@@ -9557,7 +9700,7 @@ class AppStateSyncKey final :
   public:
   void clear_keydata();
   const ::proto::AppStateSyncKeyData& keydata() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::AppStateSyncKeyData* release_keydata();
+  PROTOBUF_NODISCARD ::proto::AppStateSyncKeyData* release_keydata();
   ::proto::AppStateSyncKeyData* mutable_keydata();
   void set_allocated_keydata(::proto::AppStateSyncKeyData* keydata);
   private:
@@ -9575,10 +9718,13 @@ class AppStateSyncKey final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::proto::AppStateSyncKeyId* keyid_;
-  ::proto::AppStateSyncKeyData* keydata_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::proto::AppStateSyncKeyId* keyid_;
+    ::proto::AppStateSyncKeyData* keydata_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -9588,7 +9734,7 @@ class AppStateSyncKeyId final :
  public:
   inline AppStateSyncKeyId() : AppStateSyncKeyId(nullptr) {}
   ~AppStateSyncKeyId() override;
-  explicit constexpr AppStateSyncKeyId(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR AppStateSyncKeyId(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   AppStateSyncKeyId(const AppStateSyncKeyId& from);
   AppStateSyncKeyId(AppStateSyncKeyId&& from) noexcept
@@ -9645,7 +9791,12 @@ class AppStateSyncKeyId final :
   }
   inline void Swap(AppStateSyncKeyId* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -9659,34 +9810,34 @@ class AppStateSyncKeyId final :
 
   // implements Message ----------------------------------------------
 
-  inline AppStateSyncKeyId* New() const final {
-    return new AppStateSyncKeyId();
-  }
-
-  AppStateSyncKeyId* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  AppStateSyncKeyId* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<AppStateSyncKeyId>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const AppStateSyncKeyId& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const AppStateSyncKeyId& from);
+  void MergeFrom( const AppStateSyncKeyId& from) {
+    AppStateSyncKeyId::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(AppStateSyncKeyId* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.AppStateSyncKeyId";
@@ -9694,9 +9845,6 @@ class AppStateSyncKeyId final :
   protected:
   explicit AppStateSyncKeyId(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -9721,7 +9869,7 @@ class AppStateSyncKeyId final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_keyid(ArgT0&& arg0, ArgT... args);
   std::string* mutable_keyid();
-  PROTOBUF_MUST_USE_RESULT std::string* release_keyid();
+  PROTOBUF_NODISCARD std::string* release_keyid();
   void set_allocated_keyid(std::string* keyid);
   private:
   const std::string& _internal_keyid() const;
@@ -9736,9 +9884,12 @@ class AppStateSyncKeyId final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr keyid_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr keyid_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -9748,7 +9899,7 @@ class AppStateSyncKeyFingerprint final :
  public:
   inline AppStateSyncKeyFingerprint() : AppStateSyncKeyFingerprint(nullptr) {}
   ~AppStateSyncKeyFingerprint() override;
-  explicit constexpr AppStateSyncKeyFingerprint(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR AppStateSyncKeyFingerprint(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   AppStateSyncKeyFingerprint(const AppStateSyncKeyFingerprint& from);
   AppStateSyncKeyFingerprint(AppStateSyncKeyFingerprint&& from) noexcept
@@ -9805,7 +9956,12 @@ class AppStateSyncKeyFingerprint final :
   }
   inline void Swap(AppStateSyncKeyFingerprint* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -9819,34 +9975,34 @@ class AppStateSyncKeyFingerprint final :
 
   // implements Message ----------------------------------------------
 
-  inline AppStateSyncKeyFingerprint* New() const final {
-    return new AppStateSyncKeyFingerprint();
-  }
-
-  AppStateSyncKeyFingerprint* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  AppStateSyncKeyFingerprint* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<AppStateSyncKeyFingerprint>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const AppStateSyncKeyFingerprint& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const AppStateSyncKeyFingerprint& from);
+  void MergeFrom( const AppStateSyncKeyFingerprint& from) {
+    AppStateSyncKeyFingerprint::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(AppStateSyncKeyFingerprint* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.AppStateSyncKeyFingerprint";
@@ -9854,9 +10010,6 @@ class AppStateSyncKeyFingerprint final :
   protected:
   explicit AppStateSyncKeyFingerprint(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -9880,19 +10033,19 @@ class AppStateSyncKeyFingerprint final :
   public:
   void clear_deviceindexes();
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_deviceindexes(int index) const;
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >&
+  uint32_t _internal_deviceindexes(int index) const;
+  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >&
       _internal_deviceindexes() const;
-  void _internal_add_deviceindexes(::PROTOBUF_NAMESPACE_ID::uint32 value);
-  ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >*
+  void _internal_add_deviceindexes(uint32_t value);
+  ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >*
       _internal_mutable_deviceindexes();
   public:
-  ::PROTOBUF_NAMESPACE_ID::uint32 deviceindexes(int index) const;
-  void set_deviceindexes(int index, ::PROTOBUF_NAMESPACE_ID::uint32 value);
-  void add_deviceindexes(::PROTOBUF_NAMESPACE_ID::uint32 value);
-  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >&
+  uint32_t deviceindexes(int index) const;
+  void set_deviceindexes(int index, uint32_t value);
+  void add_deviceindexes(uint32_t value);
+  const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >&
       deviceindexes() const;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >*
+  ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >*
       mutable_deviceindexes();
 
   // optional uint32 rawId = 1;
@@ -9901,11 +10054,11 @@ class AppStateSyncKeyFingerprint final :
   bool _internal_has_rawid() const;
   public:
   void clear_rawid();
-  ::PROTOBUF_NAMESPACE_ID::uint32 rawid() const;
-  void set_rawid(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t rawid() const;
+  void set_rawid(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_rawid() const;
-  void _internal_set_rawid(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_rawid() const;
+  void _internal_set_rawid(uint32_t value);
   public:
 
   // optional uint32 currentIndex = 2;
@@ -9914,11 +10067,11 @@ class AppStateSyncKeyFingerprint final :
   bool _internal_has_currentindex() const;
   public:
   void clear_currentindex();
-  ::PROTOBUF_NAMESPACE_ID::uint32 currentindex() const;
-  void set_currentindex(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t currentindex() const;
+  void set_currentindex(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_currentindex() const;
-  void _internal_set_currentindex(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_currentindex() const;
+  void _internal_set_currentindex(uint32_t value);
   public:
 
   // @@protoc_insertion_point(class_scope:proto.AppStateSyncKeyFingerprint)
@@ -9928,12 +10081,15 @@ class AppStateSyncKeyFingerprint final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 > deviceindexes_;
-  mutable std::atomic<int> _deviceindexes_cached_byte_size_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 rawid_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 currentindex_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t > deviceindexes_;
+    mutable std::atomic<int> _deviceindexes_cached_byte_size_;
+    uint32_t rawid_;
+    uint32_t currentindex_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -9943,7 +10099,7 @@ class AppStateSyncKeyData final :
  public:
   inline AppStateSyncKeyData() : AppStateSyncKeyData(nullptr) {}
   ~AppStateSyncKeyData() override;
-  explicit constexpr AppStateSyncKeyData(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR AppStateSyncKeyData(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   AppStateSyncKeyData(const AppStateSyncKeyData& from);
   AppStateSyncKeyData(AppStateSyncKeyData&& from) noexcept
@@ -10000,7 +10156,12 @@ class AppStateSyncKeyData final :
   }
   inline void Swap(AppStateSyncKeyData* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -10014,34 +10175,34 @@ class AppStateSyncKeyData final :
 
   // implements Message ----------------------------------------------
 
-  inline AppStateSyncKeyData* New() const final {
-    return new AppStateSyncKeyData();
-  }
-
-  AppStateSyncKeyData* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  AppStateSyncKeyData* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<AppStateSyncKeyData>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const AppStateSyncKeyData& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const AppStateSyncKeyData& from);
+  void MergeFrom( const AppStateSyncKeyData& from) {
+    AppStateSyncKeyData::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(AppStateSyncKeyData* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.AppStateSyncKeyData";
@@ -10049,9 +10210,6 @@ class AppStateSyncKeyData final :
   protected:
   explicit AppStateSyncKeyData(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -10078,7 +10236,7 @@ class AppStateSyncKeyData final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_keydata(ArgT0&& arg0, ArgT... args);
   std::string* mutable_keydata();
-  PROTOBUF_MUST_USE_RESULT std::string* release_keydata();
+  PROTOBUF_NODISCARD std::string* release_keydata();
   void set_allocated_keydata(std::string* keydata);
   private:
   const std::string& _internal_keydata() const;
@@ -10093,7 +10251,7 @@ class AppStateSyncKeyData final :
   public:
   void clear_fingerprint();
   const ::proto::AppStateSyncKeyFingerprint& fingerprint() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::AppStateSyncKeyFingerprint* release_fingerprint();
+  PROTOBUF_NODISCARD ::proto::AppStateSyncKeyFingerprint* release_fingerprint();
   ::proto::AppStateSyncKeyFingerprint* mutable_fingerprint();
   void set_allocated_fingerprint(::proto::AppStateSyncKeyFingerprint* fingerprint);
   private:
@@ -10110,11 +10268,11 @@ class AppStateSyncKeyData final :
   bool _internal_has_timestamp() const;
   public:
   void clear_timestamp();
-  ::PROTOBUF_NAMESPACE_ID::int64 timestamp() const;
-  void set_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t timestamp() const;
+  void set_timestamp(int64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::int64 _internal_timestamp() const;
-  void _internal_set_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t _internal_timestamp() const;
+  void _internal_set_timestamp(int64_t value);
   public:
 
   // @@protoc_insertion_point(class_scope:proto.AppStateSyncKeyData)
@@ -10124,11 +10282,14 @@ class AppStateSyncKeyData final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr keydata_;
-  ::proto::AppStateSyncKeyFingerprint* fingerprint_;
-  ::PROTOBUF_NAMESPACE_ID::int64 timestamp_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr keydata_;
+    ::proto::AppStateSyncKeyFingerprint* fingerprint_;
+    int64_t timestamp_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -10138,7 +10299,7 @@ class AppStateSyncKeyShare final :
  public:
   inline AppStateSyncKeyShare() : AppStateSyncKeyShare(nullptr) {}
   ~AppStateSyncKeyShare() override;
-  explicit constexpr AppStateSyncKeyShare(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR AppStateSyncKeyShare(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   AppStateSyncKeyShare(const AppStateSyncKeyShare& from);
   AppStateSyncKeyShare(AppStateSyncKeyShare&& from) noexcept
@@ -10195,7 +10356,12 @@ class AppStateSyncKeyShare final :
   }
   inline void Swap(AppStateSyncKeyShare* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -10209,34 +10375,34 @@ class AppStateSyncKeyShare final :
 
   // implements Message ----------------------------------------------
 
-  inline AppStateSyncKeyShare* New() const final {
-    return new AppStateSyncKeyShare();
-  }
-
-  AppStateSyncKeyShare* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  AppStateSyncKeyShare* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<AppStateSyncKeyShare>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const AppStateSyncKeyShare& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const AppStateSyncKeyShare& from);
+  void MergeFrom( const AppStateSyncKeyShare& from) {
+    AppStateSyncKeyShare::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(AppStateSyncKeyShare* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.AppStateSyncKeyShare";
@@ -10244,9 +10410,6 @@ class AppStateSyncKeyShare final :
   protected:
   explicit AppStateSyncKeyShare(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -10286,8 +10449,11 @@ class AppStateSyncKeyShare final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::AppStateSyncKey > keys_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::AppStateSyncKey > keys_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -10297,7 +10463,7 @@ class AppStateSyncKeyRequest final :
  public:
   inline AppStateSyncKeyRequest() : AppStateSyncKeyRequest(nullptr) {}
   ~AppStateSyncKeyRequest() override;
-  explicit constexpr AppStateSyncKeyRequest(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR AppStateSyncKeyRequest(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   AppStateSyncKeyRequest(const AppStateSyncKeyRequest& from);
   AppStateSyncKeyRequest(AppStateSyncKeyRequest&& from) noexcept
@@ -10354,7 +10520,12 @@ class AppStateSyncKeyRequest final :
   }
   inline void Swap(AppStateSyncKeyRequest* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -10368,34 +10539,34 @@ class AppStateSyncKeyRequest final :
 
   // implements Message ----------------------------------------------
 
-  inline AppStateSyncKeyRequest* New() const final {
-    return new AppStateSyncKeyRequest();
-  }
-
-  AppStateSyncKeyRequest* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  AppStateSyncKeyRequest* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<AppStateSyncKeyRequest>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const AppStateSyncKeyRequest& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const AppStateSyncKeyRequest& from);
+  void MergeFrom( const AppStateSyncKeyRequest& from) {
+    AppStateSyncKeyRequest::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(AppStateSyncKeyRequest* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.AppStateSyncKeyRequest";
@@ -10403,9 +10574,6 @@ class AppStateSyncKeyRequest final :
   protected:
   explicit AppStateSyncKeyRequest(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -10445,8 +10613,11 @@ class AppStateSyncKeyRequest final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::AppStateSyncKeyId > keyids_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::AppStateSyncKeyId > keyids_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -10456,7 +10627,7 @@ class AppStateFatalExceptionNotification final :
  public:
   inline AppStateFatalExceptionNotification() : AppStateFatalExceptionNotification(nullptr) {}
   ~AppStateFatalExceptionNotification() override;
-  explicit constexpr AppStateFatalExceptionNotification(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR AppStateFatalExceptionNotification(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   AppStateFatalExceptionNotification(const AppStateFatalExceptionNotification& from);
   AppStateFatalExceptionNotification(AppStateFatalExceptionNotification&& from) noexcept
@@ -10513,7 +10684,12 @@ class AppStateFatalExceptionNotification final :
   }
   inline void Swap(AppStateFatalExceptionNotification* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -10527,34 +10703,34 @@ class AppStateFatalExceptionNotification final :
 
   // implements Message ----------------------------------------------
 
-  inline AppStateFatalExceptionNotification* New() const final {
-    return new AppStateFatalExceptionNotification();
-  }
-
-  AppStateFatalExceptionNotification* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  AppStateFatalExceptionNotification* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<AppStateFatalExceptionNotification>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const AppStateFatalExceptionNotification& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const AppStateFatalExceptionNotification& from);
+  void MergeFrom( const AppStateFatalExceptionNotification& from) {
+    AppStateFatalExceptionNotification::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(AppStateFatalExceptionNotification* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.AppStateFatalExceptionNotification";
@@ -10562,9 +10738,6 @@ class AppStateFatalExceptionNotification final :
   protected:
   explicit AppStateFatalExceptionNotification(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -10610,11 +10783,11 @@ class AppStateFatalExceptionNotification final :
   bool _internal_has_timestamp() const;
   public:
   void clear_timestamp();
-  ::PROTOBUF_NAMESPACE_ID::int64 timestamp() const;
-  void set_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t timestamp() const;
+  void set_timestamp(int64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::int64 _internal_timestamp() const;
-  void _internal_set_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t _internal_timestamp() const;
+  void _internal_set_timestamp(int64_t value);
   public:
 
   // @@protoc_insertion_point(class_scope:proto.AppStateFatalExceptionNotification)
@@ -10624,10 +10797,13 @@ class AppStateFatalExceptionNotification final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> collectionnames_;
-  ::PROTOBUF_NAMESPACE_ID::int64 timestamp_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> collectionnames_;
+    int64_t timestamp_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -10637,7 +10813,7 @@ class InitialSecurityNotificationSettingSync final :
  public:
   inline InitialSecurityNotificationSettingSync() : InitialSecurityNotificationSettingSync(nullptr) {}
   ~InitialSecurityNotificationSettingSync() override;
-  explicit constexpr InitialSecurityNotificationSettingSync(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR InitialSecurityNotificationSettingSync(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   InitialSecurityNotificationSettingSync(const InitialSecurityNotificationSettingSync& from);
   InitialSecurityNotificationSettingSync(InitialSecurityNotificationSettingSync&& from) noexcept
@@ -10694,7 +10870,12 @@ class InitialSecurityNotificationSettingSync final :
   }
   inline void Swap(InitialSecurityNotificationSettingSync* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -10708,34 +10889,34 @@ class InitialSecurityNotificationSettingSync final :
 
   // implements Message ----------------------------------------------
 
-  inline InitialSecurityNotificationSettingSync* New() const final {
-    return new InitialSecurityNotificationSettingSync();
-  }
-
-  InitialSecurityNotificationSettingSync* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  InitialSecurityNotificationSettingSync* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<InitialSecurityNotificationSettingSync>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const InitialSecurityNotificationSettingSync& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const InitialSecurityNotificationSettingSync& from);
+  void MergeFrom( const InitialSecurityNotificationSettingSync& from) {
+    InitialSecurityNotificationSettingSync::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(InitialSecurityNotificationSettingSync* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.InitialSecurityNotificationSettingSync";
@@ -10743,9 +10924,6 @@ class InitialSecurityNotificationSettingSync final :
   protected:
   explicit InitialSecurityNotificationSettingSync(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -10780,9 +10958,12 @@ class InitialSecurityNotificationSettingSync final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  bool securitynotificationenabled_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    bool securitynotificationenabled_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -10792,7 +10973,7 @@ class ContactsArrayMessage final :
  public:
   inline ContactsArrayMessage() : ContactsArrayMessage(nullptr) {}
   ~ContactsArrayMessage() override;
-  explicit constexpr ContactsArrayMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR ContactsArrayMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   ContactsArrayMessage(const ContactsArrayMessage& from);
   ContactsArrayMessage(ContactsArrayMessage&& from) noexcept
@@ -10849,7 +11030,12 @@ class ContactsArrayMessage final :
   }
   inline void Swap(ContactsArrayMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -10863,34 +11049,34 @@ class ContactsArrayMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline ContactsArrayMessage* New() const final {
-    return new ContactsArrayMessage();
-  }
-
-  ContactsArrayMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  ContactsArrayMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<ContactsArrayMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const ContactsArrayMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const ContactsArrayMessage& from);
+  void MergeFrom( const ContactsArrayMessage& from) {
+    ContactsArrayMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(ContactsArrayMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.ContactsArrayMessage";
@@ -10898,9 +11084,6 @@ class ContactsArrayMessage final :
   protected:
   explicit ContactsArrayMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -10945,7 +11128,7 @@ class ContactsArrayMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_displayname(ArgT0&& arg0, ArgT... args);
   std::string* mutable_displayname();
-  PROTOBUF_MUST_USE_RESULT std::string* release_displayname();
+  PROTOBUF_NODISCARD std::string* release_displayname();
   void set_allocated_displayname(std::string* displayname);
   private:
   const std::string& _internal_displayname() const;
@@ -10960,7 +11143,7 @@ class ContactsArrayMessage final :
   public:
   void clear_contextinfo();
   const ::proto::ContextInfo& contextinfo() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ContextInfo* release_contextinfo();
+  PROTOBUF_NODISCARD ::proto::ContextInfo* release_contextinfo();
   ::proto::ContextInfo* mutable_contextinfo();
   void set_allocated_contextinfo(::proto::ContextInfo* contextinfo);
   private:
@@ -10978,11 +11161,14 @@ class ContactsArrayMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::ContactMessage > contacts_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr displayname_;
-  ::proto::ContextInfo* contextinfo_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::ContactMessage > contacts_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr displayname_;
+    ::proto::ContextInfo* contextinfo_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -10992,7 +11178,7 @@ class HSMCurrency final :
  public:
   inline HSMCurrency() : HSMCurrency(nullptr) {}
   ~HSMCurrency() override;
-  explicit constexpr HSMCurrency(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR HSMCurrency(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   HSMCurrency(const HSMCurrency& from);
   HSMCurrency(HSMCurrency&& from) noexcept
@@ -11049,7 +11235,12 @@ class HSMCurrency final :
   }
   inline void Swap(HSMCurrency* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -11063,34 +11254,34 @@ class HSMCurrency final :
 
   // implements Message ----------------------------------------------
 
-  inline HSMCurrency* New() const final {
-    return new HSMCurrency();
-  }
-
-  HSMCurrency* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  HSMCurrency* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<HSMCurrency>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const HSMCurrency& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const HSMCurrency& from);
+  void MergeFrom( const HSMCurrency& from) {
+    HSMCurrency::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(HSMCurrency* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.HSMCurrency";
@@ -11098,9 +11289,6 @@ class HSMCurrency final :
   protected:
   explicit HSMCurrency(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -11126,7 +11314,7 @@ class HSMCurrency final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_currencycode(ArgT0&& arg0, ArgT... args);
   std::string* mutable_currencycode();
-  PROTOBUF_MUST_USE_RESULT std::string* release_currencycode();
+  PROTOBUF_NODISCARD std::string* release_currencycode();
   void set_allocated_currencycode(std::string* currencycode);
   private:
   const std::string& _internal_currencycode() const;
@@ -11140,11 +11328,11 @@ class HSMCurrency final :
   bool _internal_has_amount1000() const;
   public:
   void clear_amount1000();
-  ::PROTOBUF_NAMESPACE_ID::int64 amount1000() const;
-  void set_amount1000(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t amount1000() const;
+  void set_amount1000(int64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::int64 _internal_amount1000() const;
-  void _internal_set_amount1000(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t _internal_amount1000() const;
+  void _internal_set_amount1000(int64_t value);
   public:
 
   // @@protoc_insertion_point(class_scope:proto.HSMCurrency)
@@ -11154,10 +11342,13 @@ class HSMCurrency final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr currencycode_;
-  ::PROTOBUF_NAMESPACE_ID::int64 amount1000_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr currencycode_;
+    int64_t amount1000_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -11167,7 +11358,7 @@ class HSMDateTimeComponent final :
  public:
   inline HSMDateTimeComponent() : HSMDateTimeComponent(nullptr) {}
   ~HSMDateTimeComponent() override;
-  explicit constexpr HSMDateTimeComponent(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR HSMDateTimeComponent(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   HSMDateTimeComponent(const HSMDateTimeComponent& from);
   HSMDateTimeComponent(HSMDateTimeComponent&& from) noexcept
@@ -11224,7 +11415,12 @@ class HSMDateTimeComponent final :
   }
   inline void Swap(HSMDateTimeComponent* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -11238,34 +11434,34 @@ class HSMDateTimeComponent final :
 
   // implements Message ----------------------------------------------
 
-  inline HSMDateTimeComponent* New() const final {
-    return new HSMDateTimeComponent();
-  }
-
-  HSMDateTimeComponent* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  HSMDateTimeComponent* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<HSMDateTimeComponent>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const HSMDateTimeComponent& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const HSMDateTimeComponent& from);
+  void MergeFrom( const HSMDateTimeComponent& from) {
+    HSMDateTimeComponent::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(HSMDateTimeComponent* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.HSMDateTimeComponent";
@@ -11273,9 +11469,6 @@ class HSMDateTimeComponent final :
   protected:
   explicit HSMDateTimeComponent(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -11372,11 +11565,11 @@ class HSMDateTimeComponent final :
   bool _internal_has_year() const;
   public:
   void clear_year();
-  ::PROTOBUF_NAMESPACE_ID::uint32 year() const;
-  void set_year(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t year() const;
+  void set_year(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_year() const;
-  void _internal_set_year(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_year() const;
+  void _internal_set_year(uint32_t value);
   public:
 
   // optional uint32 month = 3;
@@ -11385,11 +11578,11 @@ class HSMDateTimeComponent final :
   bool _internal_has_month() const;
   public:
   void clear_month();
-  ::PROTOBUF_NAMESPACE_ID::uint32 month() const;
-  void set_month(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t month() const;
+  void set_month(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_month() const;
-  void _internal_set_month(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_month() const;
+  void _internal_set_month(uint32_t value);
   public:
 
   // optional uint32 dayOfMonth = 4;
@@ -11398,11 +11591,11 @@ class HSMDateTimeComponent final :
   bool _internal_has_dayofmonth() const;
   public:
   void clear_dayofmonth();
-  ::PROTOBUF_NAMESPACE_ID::uint32 dayofmonth() const;
-  void set_dayofmonth(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t dayofmonth() const;
+  void set_dayofmonth(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_dayofmonth() const;
-  void _internal_set_dayofmonth(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_dayofmonth() const;
+  void _internal_set_dayofmonth(uint32_t value);
   public:
 
   // optional uint32 hour = 5;
@@ -11411,11 +11604,11 @@ class HSMDateTimeComponent final :
   bool _internal_has_hour() const;
   public:
   void clear_hour();
-  ::PROTOBUF_NAMESPACE_ID::uint32 hour() const;
-  void set_hour(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t hour() const;
+  void set_hour(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_hour() const;
-  void _internal_set_hour(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_hour() const;
+  void _internal_set_hour(uint32_t value);
   public:
 
   // optional uint32 minute = 6;
@@ -11424,11 +11617,11 @@ class HSMDateTimeComponent final :
   bool _internal_has_minute() const;
   public:
   void clear_minute();
-  ::PROTOBUF_NAMESPACE_ID::uint32 minute() const;
-  void set_minute(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t minute() const;
+  void set_minute(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_minute() const;
-  void _internal_set_minute(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_minute() const;
+  void _internal_set_minute(uint32_t value);
   public:
 
   // optional .proto.HSMDateTimeComponent.HSMDateTimeComponentDayOfWeekType dayOfWeek = 1;
@@ -11464,15 +11657,18 @@ class HSMDateTimeComponent final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 year_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 month_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 dayofmonth_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 hour_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 minute_;
-  int dayofweek_;
-  int calendar_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    uint32_t year_;
+    uint32_t month_;
+    uint32_t dayofmonth_;
+    uint32_t hour_;
+    uint32_t minute_;
+    int dayofweek_;
+    int calendar_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -11482,7 +11678,7 @@ class HSMDateTimeUnixEpoch final :
  public:
   inline HSMDateTimeUnixEpoch() : HSMDateTimeUnixEpoch(nullptr) {}
   ~HSMDateTimeUnixEpoch() override;
-  explicit constexpr HSMDateTimeUnixEpoch(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR HSMDateTimeUnixEpoch(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   HSMDateTimeUnixEpoch(const HSMDateTimeUnixEpoch& from);
   HSMDateTimeUnixEpoch(HSMDateTimeUnixEpoch&& from) noexcept
@@ -11539,7 +11735,12 @@ class HSMDateTimeUnixEpoch final :
   }
   inline void Swap(HSMDateTimeUnixEpoch* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -11553,34 +11754,34 @@ class HSMDateTimeUnixEpoch final :
 
   // implements Message ----------------------------------------------
 
-  inline HSMDateTimeUnixEpoch* New() const final {
-    return new HSMDateTimeUnixEpoch();
-  }
-
-  HSMDateTimeUnixEpoch* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  HSMDateTimeUnixEpoch* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<HSMDateTimeUnixEpoch>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const HSMDateTimeUnixEpoch& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const HSMDateTimeUnixEpoch& from);
+  void MergeFrom( const HSMDateTimeUnixEpoch& from) {
+    HSMDateTimeUnixEpoch::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(HSMDateTimeUnixEpoch* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.HSMDateTimeUnixEpoch";
@@ -11588,9 +11789,6 @@ class HSMDateTimeUnixEpoch final :
   protected:
   explicit HSMDateTimeUnixEpoch(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -11611,11 +11809,11 @@ class HSMDateTimeUnixEpoch final :
   bool _internal_has_timestamp() const;
   public:
   void clear_timestamp();
-  ::PROTOBUF_NAMESPACE_ID::int64 timestamp() const;
-  void set_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t timestamp() const;
+  void set_timestamp(int64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::int64 _internal_timestamp() const;
-  void _internal_set_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t _internal_timestamp() const;
+  void _internal_set_timestamp(int64_t value);
   public:
 
   // @@protoc_insertion_point(class_scope:proto.HSMDateTimeUnixEpoch)
@@ -11625,9 +11823,12 @@ class HSMDateTimeUnixEpoch final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::int64 timestamp_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    int64_t timestamp_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -11637,7 +11838,7 @@ class HSMDateTime final :
  public:
   inline HSMDateTime() : HSMDateTime(nullptr) {}
   ~HSMDateTime() override;
-  explicit constexpr HSMDateTime(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR HSMDateTime(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   HSMDateTime(const HSMDateTime& from);
   HSMDateTime(HSMDateTime&& from) noexcept
@@ -11700,7 +11901,12 @@ class HSMDateTime final :
   }
   inline void Swap(HSMDateTime* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -11714,34 +11920,34 @@ class HSMDateTime final :
 
   // implements Message ----------------------------------------------
 
-  inline HSMDateTime* New() const final {
-    return new HSMDateTime();
-  }
-
-  HSMDateTime* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  HSMDateTime* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<HSMDateTime>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const HSMDateTime& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const HSMDateTime& from);
+  void MergeFrom( const HSMDateTime& from) {
+    HSMDateTime::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(HSMDateTime* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.HSMDateTime";
@@ -11749,9 +11955,6 @@ class HSMDateTime final :
   protected:
   explicit HSMDateTime(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -11774,7 +11977,7 @@ class HSMDateTime final :
   public:
   void clear_component();
   const ::proto::HSMDateTimeComponent& component() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::HSMDateTimeComponent* release_component();
+  PROTOBUF_NODISCARD ::proto::HSMDateTimeComponent* release_component();
   ::proto::HSMDateTimeComponent* mutable_component();
   void set_allocated_component(::proto::HSMDateTimeComponent* component);
   private:
@@ -11792,7 +11995,7 @@ class HSMDateTime final :
   public:
   void clear_unixepoch();
   const ::proto::HSMDateTimeUnixEpoch& unixepoch() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::HSMDateTimeUnixEpoch* release_unixepoch();
+  PROTOBUF_NODISCARD ::proto::HSMDateTimeUnixEpoch* release_unixepoch();
   ::proto::HSMDateTimeUnixEpoch* mutable_unixepoch();
   void set_allocated_unixepoch(::proto::HSMDateTimeUnixEpoch* unixepoch);
   private:
@@ -11817,15 +12020,18 @@ class HSMDateTime final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  union DatetimeOneofUnion {
-    constexpr DatetimeOneofUnion() : _constinit_{} {}
-      ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized _constinit_;
-    ::proto::HSMDateTimeComponent* component_;
-    ::proto::HSMDateTimeUnixEpoch* unixepoch_;
-  } datetimeOneof_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 _oneof_case_[1];
+  struct Impl_ {
+    union DatetimeOneofUnion {
+      constexpr DatetimeOneofUnion() : _constinit_{} {}
+        ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized _constinit_;
+      ::proto::HSMDateTimeComponent* component_;
+      ::proto::HSMDateTimeUnixEpoch* unixepoch_;
+    } datetimeOneof_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    uint32_t _oneof_case_[1];
 
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -11835,7 +12041,7 @@ class HSMLocalizableParameter final :
  public:
   inline HSMLocalizableParameter() : HSMLocalizableParameter(nullptr) {}
   ~HSMLocalizableParameter() override;
-  explicit constexpr HSMLocalizableParameter(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR HSMLocalizableParameter(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   HSMLocalizableParameter(const HSMLocalizableParameter& from);
   HSMLocalizableParameter(HSMLocalizableParameter&& from) noexcept
@@ -11898,7 +12104,12 @@ class HSMLocalizableParameter final :
   }
   inline void Swap(HSMLocalizableParameter* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -11912,34 +12123,34 @@ class HSMLocalizableParameter final :
 
   // implements Message ----------------------------------------------
 
-  inline HSMLocalizableParameter* New() const final {
-    return new HSMLocalizableParameter();
-  }
-
-  HSMLocalizableParameter* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  HSMLocalizableParameter* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<HSMLocalizableParameter>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const HSMLocalizableParameter& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const HSMLocalizableParameter& from);
+  void MergeFrom( const HSMLocalizableParameter& from) {
+    HSMLocalizableParameter::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(HSMLocalizableParameter* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.HSMLocalizableParameter";
@@ -11947,9 +12158,6 @@ class HSMLocalizableParameter final :
   protected:
   explicit HSMLocalizableParameter(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -11976,7 +12184,7 @@ class HSMLocalizableParameter final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_default_(ArgT0&& arg0, ArgT... args);
   std::string* mutable_default_();
-  PROTOBUF_MUST_USE_RESULT std::string* release_default_();
+  PROTOBUF_NODISCARD std::string* release_default_();
   void set_allocated_default_(std::string* default_);
   private:
   const std::string& _internal_default_() const;
@@ -11991,7 +12199,7 @@ class HSMLocalizableParameter final :
   public:
   void clear_currency();
   const ::proto::HSMCurrency& currency() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::HSMCurrency* release_currency();
+  PROTOBUF_NODISCARD ::proto::HSMCurrency* release_currency();
   ::proto::HSMCurrency* mutable_currency();
   void set_allocated_currency(::proto::HSMCurrency* currency);
   private:
@@ -12009,7 +12217,7 @@ class HSMLocalizableParameter final :
   public:
   void clear_datetime();
   const ::proto::HSMDateTime& datetime() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::HSMDateTime* release_datetime();
+  PROTOBUF_NODISCARD ::proto::HSMDateTime* release_datetime();
   ::proto::HSMDateTime* mutable_datetime();
   void set_allocated_datetime(::proto::HSMDateTime* datetime);
   private:
@@ -12034,17 +12242,20 @@ class HSMLocalizableParameter final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr default__;
-  union ParamOneofUnion {
-    constexpr ParamOneofUnion() : _constinit_{} {}
-      ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized _constinit_;
-    ::proto::HSMCurrency* currency_;
-    ::proto::HSMDateTime* datetime_;
-  } paramOneof_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 _oneof_case_[1];
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr default__;
+    union ParamOneofUnion {
+      constexpr ParamOneofUnion() : _constinit_{} {}
+        ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized _constinit_;
+      ::proto::HSMCurrency* currency_;
+      ::proto::HSMDateTime* datetime_;
+    } paramOneof_;
+    uint32_t _oneof_case_[1];
 
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -12054,7 +12265,7 @@ class HighlyStructuredMessage final :
  public:
   inline HighlyStructuredMessage() : HighlyStructuredMessage(nullptr) {}
   ~HighlyStructuredMessage() override;
-  explicit constexpr HighlyStructuredMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR HighlyStructuredMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   HighlyStructuredMessage(const HighlyStructuredMessage& from);
   HighlyStructuredMessage(HighlyStructuredMessage&& from) noexcept
@@ -12111,7 +12322,12 @@ class HighlyStructuredMessage final :
   }
   inline void Swap(HighlyStructuredMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -12125,34 +12341,34 @@ class HighlyStructuredMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline HighlyStructuredMessage* New() const final {
-    return new HighlyStructuredMessage();
-  }
-
-  HighlyStructuredMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  HighlyStructuredMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<HighlyStructuredMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const HighlyStructuredMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const HighlyStructuredMessage& from);
+  void MergeFrom( const HighlyStructuredMessage& from) {
+    HighlyStructuredMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(HighlyStructuredMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.HighlyStructuredMessage";
@@ -12160,9 +12376,6 @@ class HighlyStructuredMessage final :
   protected:
   explicit HighlyStructuredMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -12237,7 +12450,7 @@ class HighlyStructuredMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_namespace_(ArgT0&& arg0, ArgT... args);
   std::string* mutable_namespace_();
-  PROTOBUF_MUST_USE_RESULT std::string* release_namespace_();
+  PROTOBUF_NODISCARD std::string* release_namespace_();
   void set_allocated_namespace_(std::string* namespace_);
   private:
   const std::string& _internal_namespace_() const;
@@ -12255,7 +12468,7 @@ class HighlyStructuredMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_elementname(ArgT0&& arg0, ArgT... args);
   std::string* mutable_elementname();
-  PROTOBUF_MUST_USE_RESULT std::string* release_elementname();
+  PROTOBUF_NODISCARD std::string* release_elementname();
   void set_allocated_elementname(std::string* elementname);
   private:
   const std::string& _internal_elementname() const;
@@ -12273,7 +12486,7 @@ class HighlyStructuredMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_fallbacklg(ArgT0&& arg0, ArgT... args);
   std::string* mutable_fallbacklg();
-  PROTOBUF_MUST_USE_RESULT std::string* release_fallbacklg();
+  PROTOBUF_NODISCARD std::string* release_fallbacklg();
   void set_allocated_fallbacklg(std::string* fallbacklg);
   private:
   const std::string& _internal_fallbacklg() const;
@@ -12291,7 +12504,7 @@ class HighlyStructuredMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_fallbacklc(ArgT0&& arg0, ArgT... args);
   std::string* mutable_fallbacklc();
-  PROTOBUF_MUST_USE_RESULT std::string* release_fallbacklc();
+  PROTOBUF_NODISCARD std::string* release_fallbacklc();
   void set_allocated_fallbacklc(std::string* fallbacklc);
   private:
   const std::string& _internal_fallbacklc() const;
@@ -12309,7 +12522,7 @@ class HighlyStructuredMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_deterministiclg(ArgT0&& arg0, ArgT... args);
   std::string* mutable_deterministiclg();
-  PROTOBUF_MUST_USE_RESULT std::string* release_deterministiclg();
+  PROTOBUF_NODISCARD std::string* release_deterministiclg();
   void set_allocated_deterministiclg(std::string* deterministiclg);
   private:
   const std::string& _internal_deterministiclg() const;
@@ -12327,7 +12540,7 @@ class HighlyStructuredMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_deterministiclc(ArgT0&& arg0, ArgT... args);
   std::string* mutable_deterministiclc();
-  PROTOBUF_MUST_USE_RESULT std::string* release_deterministiclc();
+  PROTOBUF_NODISCARD std::string* release_deterministiclc();
   void set_allocated_deterministiclc(std::string* deterministiclc);
   private:
   const std::string& _internal_deterministiclc() const;
@@ -12342,7 +12555,7 @@ class HighlyStructuredMessage final :
   public:
   void clear_hydratedhsm();
   const ::proto::TemplateMessage& hydratedhsm() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::TemplateMessage* release_hydratedhsm();
+  PROTOBUF_NODISCARD ::proto::TemplateMessage* release_hydratedhsm();
   ::proto::TemplateMessage* mutable_hydratedhsm();
   void set_allocated_hydratedhsm(::proto::TemplateMessage* hydratedhsm);
   private:
@@ -12360,17 +12573,20 @@ class HighlyStructuredMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> params_;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::HSMLocalizableParameter > localizableparams_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr namespace__;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr elementname_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr fallbacklg_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr fallbacklc_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr deterministiclg_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr deterministiclc_;
-  ::proto::TemplateMessage* hydratedhsm_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> params_;
+    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::HSMLocalizableParameter > localizableparams_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr namespace__;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr elementname_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr fallbacklg_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr fallbacklc_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr deterministiclg_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr deterministiclc_;
+    ::proto::TemplateMessage* hydratedhsm_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -12380,7 +12596,7 @@ class SendPaymentMessage final :
  public:
   inline SendPaymentMessage() : SendPaymentMessage(nullptr) {}
   ~SendPaymentMessage() override;
-  explicit constexpr SendPaymentMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR SendPaymentMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   SendPaymentMessage(const SendPaymentMessage& from);
   SendPaymentMessage(SendPaymentMessage&& from) noexcept
@@ -12437,7 +12653,12 @@ class SendPaymentMessage final :
   }
   inline void Swap(SendPaymentMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -12451,34 +12672,34 @@ class SendPaymentMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline SendPaymentMessage* New() const final {
-    return new SendPaymentMessage();
-  }
-
-  SendPaymentMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  SendPaymentMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<SendPaymentMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const SendPaymentMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const SendPaymentMessage& from);
+  void MergeFrom( const SendPaymentMessage& from) {
+    SendPaymentMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(SendPaymentMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.SendPaymentMessage";
@@ -12486,9 +12707,6 @@ class SendPaymentMessage final :
   protected:
   explicit SendPaymentMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -12511,7 +12729,7 @@ class SendPaymentMessage final :
   public:
   void clear_notemessage();
   const ::proto::Message& notemessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::Message* release_notemessage();
+  PROTOBUF_NODISCARD ::proto::Message* release_notemessage();
   ::proto::Message* mutable_notemessage();
   void set_allocated_notemessage(::proto::Message* notemessage);
   private:
@@ -12529,7 +12747,7 @@ class SendPaymentMessage final :
   public:
   void clear_requestmessagekey();
   const ::proto::MessageKey& requestmessagekey() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::MessageKey* release_requestmessagekey();
+  PROTOBUF_NODISCARD ::proto::MessageKey* release_requestmessagekey();
   ::proto::MessageKey* mutable_requestmessagekey();
   void set_allocated_requestmessagekey(::proto::MessageKey* requestmessagekey);
   private:
@@ -12547,10 +12765,13 @@ class SendPaymentMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::proto::Message* notemessage_;
-  ::proto::MessageKey* requestmessagekey_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::proto::Message* notemessage_;
+    ::proto::MessageKey* requestmessagekey_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -12560,7 +12781,7 @@ class RequestPaymentMessage final :
  public:
   inline RequestPaymentMessage() : RequestPaymentMessage(nullptr) {}
   ~RequestPaymentMessage() override;
-  explicit constexpr RequestPaymentMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR RequestPaymentMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   RequestPaymentMessage(const RequestPaymentMessage& from);
   RequestPaymentMessage(RequestPaymentMessage&& from) noexcept
@@ -12617,7 +12838,12 @@ class RequestPaymentMessage final :
   }
   inline void Swap(RequestPaymentMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -12631,34 +12857,34 @@ class RequestPaymentMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline RequestPaymentMessage* New() const final {
-    return new RequestPaymentMessage();
-  }
-
-  RequestPaymentMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  RequestPaymentMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<RequestPaymentMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const RequestPaymentMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const RequestPaymentMessage& from);
+  void MergeFrom( const RequestPaymentMessage& from) {
+    RequestPaymentMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(RequestPaymentMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.RequestPaymentMessage";
@@ -12666,9 +12892,6 @@ class RequestPaymentMessage final :
   protected:
   explicit RequestPaymentMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -12698,7 +12921,7 @@ class RequestPaymentMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_currencycodeiso4217(ArgT0&& arg0, ArgT... args);
   std::string* mutable_currencycodeiso4217();
-  PROTOBUF_MUST_USE_RESULT std::string* release_currencycodeiso4217();
+  PROTOBUF_NODISCARD std::string* release_currencycodeiso4217();
   void set_allocated_currencycodeiso4217(std::string* currencycodeiso4217);
   private:
   const std::string& _internal_currencycodeiso4217() const;
@@ -12716,7 +12939,7 @@ class RequestPaymentMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_requestfrom(ArgT0&& arg0, ArgT... args);
   std::string* mutable_requestfrom();
-  PROTOBUF_MUST_USE_RESULT std::string* release_requestfrom();
+  PROTOBUF_NODISCARD std::string* release_requestfrom();
   void set_allocated_requestfrom(std::string* requestfrom);
   private:
   const std::string& _internal_requestfrom() const;
@@ -12731,7 +12954,7 @@ class RequestPaymentMessage final :
   public:
   void clear_notemessage();
   const ::proto::Message& notemessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::Message* release_notemessage();
+  PROTOBUF_NODISCARD ::proto::Message* release_notemessage();
   ::proto::Message* mutable_notemessage();
   void set_allocated_notemessage(::proto::Message* notemessage);
   private:
@@ -12749,7 +12972,7 @@ class RequestPaymentMessage final :
   public:
   void clear_amount();
   const ::proto::PaymentMoney& amount() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::PaymentMoney* release_amount();
+  PROTOBUF_NODISCARD ::proto::PaymentMoney* release_amount();
   ::proto::PaymentMoney* mutable_amount();
   void set_allocated_amount(::proto::PaymentMoney* amount);
   private:
@@ -12766,11 +12989,11 @@ class RequestPaymentMessage final :
   bool _internal_has_amount1000() const;
   public:
   void clear_amount1000();
-  ::PROTOBUF_NAMESPACE_ID::uint64 amount1000() const;
-  void set_amount1000(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t amount1000() const;
+  void set_amount1000(uint64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint64 _internal_amount1000() const;
-  void _internal_set_amount1000(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t _internal_amount1000() const;
+  void _internal_set_amount1000(uint64_t value);
   public:
 
   // optional int64 expiryTimestamp = 5;
@@ -12779,11 +13002,11 @@ class RequestPaymentMessage final :
   bool _internal_has_expirytimestamp() const;
   public:
   void clear_expirytimestamp();
-  ::PROTOBUF_NAMESPACE_ID::int64 expirytimestamp() const;
-  void set_expirytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t expirytimestamp() const;
+  void set_expirytimestamp(int64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::int64 _internal_expirytimestamp() const;
-  void _internal_set_expirytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t _internal_expirytimestamp() const;
+  void _internal_set_expirytimestamp(int64_t value);
   public:
 
   // @@protoc_insertion_point(class_scope:proto.RequestPaymentMessage)
@@ -12793,14 +13016,17 @@ class RequestPaymentMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr currencycodeiso4217_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr requestfrom_;
-  ::proto::Message* notemessage_;
-  ::proto::PaymentMoney* amount_;
-  ::PROTOBUF_NAMESPACE_ID::uint64 amount1000_;
-  ::PROTOBUF_NAMESPACE_ID::int64 expirytimestamp_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr currencycodeiso4217_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr requestfrom_;
+    ::proto::Message* notemessage_;
+    ::proto::PaymentMoney* amount_;
+    uint64_t amount1000_;
+    int64_t expirytimestamp_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -12810,7 +13036,7 @@ class DeclinePaymentRequestMessage final :
  public:
   inline DeclinePaymentRequestMessage() : DeclinePaymentRequestMessage(nullptr) {}
   ~DeclinePaymentRequestMessage() override;
-  explicit constexpr DeclinePaymentRequestMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR DeclinePaymentRequestMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   DeclinePaymentRequestMessage(const DeclinePaymentRequestMessage& from);
   DeclinePaymentRequestMessage(DeclinePaymentRequestMessage&& from) noexcept
@@ -12867,7 +13093,12 @@ class DeclinePaymentRequestMessage final :
   }
   inline void Swap(DeclinePaymentRequestMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -12881,34 +13112,34 @@ class DeclinePaymentRequestMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline DeclinePaymentRequestMessage* New() const final {
-    return new DeclinePaymentRequestMessage();
-  }
-
-  DeclinePaymentRequestMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  DeclinePaymentRequestMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<DeclinePaymentRequestMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const DeclinePaymentRequestMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const DeclinePaymentRequestMessage& from);
+  void MergeFrom( const DeclinePaymentRequestMessage& from) {
+    DeclinePaymentRequestMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(DeclinePaymentRequestMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.DeclinePaymentRequestMessage";
@@ -12916,9 +13147,6 @@ class DeclinePaymentRequestMessage final :
   protected:
   explicit DeclinePaymentRequestMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -12940,7 +13168,7 @@ class DeclinePaymentRequestMessage final :
   public:
   void clear_key();
   const ::proto::MessageKey& key() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::MessageKey* release_key();
+  PROTOBUF_NODISCARD ::proto::MessageKey* release_key();
   ::proto::MessageKey* mutable_key();
   void set_allocated_key(::proto::MessageKey* key);
   private:
@@ -12958,9 +13186,12 @@ class DeclinePaymentRequestMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::proto::MessageKey* key_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::proto::MessageKey* key_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -12970,7 +13201,7 @@ class CancelPaymentRequestMessage final :
  public:
   inline CancelPaymentRequestMessage() : CancelPaymentRequestMessage(nullptr) {}
   ~CancelPaymentRequestMessage() override;
-  explicit constexpr CancelPaymentRequestMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR CancelPaymentRequestMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   CancelPaymentRequestMessage(const CancelPaymentRequestMessage& from);
   CancelPaymentRequestMessage(CancelPaymentRequestMessage&& from) noexcept
@@ -13027,7 +13258,12 @@ class CancelPaymentRequestMessage final :
   }
   inline void Swap(CancelPaymentRequestMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -13041,34 +13277,34 @@ class CancelPaymentRequestMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline CancelPaymentRequestMessage* New() const final {
-    return new CancelPaymentRequestMessage();
-  }
-
-  CancelPaymentRequestMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  CancelPaymentRequestMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<CancelPaymentRequestMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const CancelPaymentRequestMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const CancelPaymentRequestMessage& from);
+  void MergeFrom( const CancelPaymentRequestMessage& from) {
+    CancelPaymentRequestMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(CancelPaymentRequestMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.CancelPaymentRequestMessage";
@@ -13076,9 +13312,6 @@ class CancelPaymentRequestMessage final :
   protected:
   explicit CancelPaymentRequestMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -13100,7 +13333,7 @@ class CancelPaymentRequestMessage final :
   public:
   void clear_key();
   const ::proto::MessageKey& key() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::MessageKey* release_key();
+  PROTOBUF_NODISCARD ::proto::MessageKey* release_key();
   ::proto::MessageKey* mutable_key();
   void set_allocated_key(::proto::MessageKey* key);
   private:
@@ -13118,9 +13351,12 @@ class CancelPaymentRequestMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::proto::MessageKey* key_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::proto::MessageKey* key_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -13130,7 +13366,7 @@ class LiveLocationMessage final :
  public:
   inline LiveLocationMessage() : LiveLocationMessage(nullptr) {}
   ~LiveLocationMessage() override;
-  explicit constexpr LiveLocationMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR LiveLocationMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   LiveLocationMessage(const LiveLocationMessage& from);
   LiveLocationMessage(LiveLocationMessage&& from) noexcept
@@ -13187,7 +13423,12 @@ class LiveLocationMessage final :
   }
   inline void Swap(LiveLocationMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -13201,34 +13442,34 @@ class LiveLocationMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline LiveLocationMessage* New() const final {
-    return new LiveLocationMessage();
-  }
-
-  LiveLocationMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  LiveLocationMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<LiveLocationMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const LiveLocationMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const LiveLocationMessage& from);
+  void MergeFrom( const LiveLocationMessage& from) {
+    LiveLocationMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(LiveLocationMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.LiveLocationMessage";
@@ -13236,9 +13477,6 @@ class LiveLocationMessage final :
   protected:
   explicit LiveLocationMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -13272,7 +13510,7 @@ class LiveLocationMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_caption(ArgT0&& arg0, ArgT... args);
   std::string* mutable_caption();
-  PROTOBUF_MUST_USE_RESULT std::string* release_caption();
+  PROTOBUF_NODISCARD std::string* release_caption();
   void set_allocated_caption(std::string* caption);
   private:
   const std::string& _internal_caption() const;
@@ -13290,7 +13528,7 @@ class LiveLocationMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_jpegthumbnail(ArgT0&& arg0, ArgT... args);
   std::string* mutable_jpegthumbnail();
-  PROTOBUF_MUST_USE_RESULT std::string* release_jpegthumbnail();
+  PROTOBUF_NODISCARD std::string* release_jpegthumbnail();
   void set_allocated_jpegthumbnail(std::string* jpegthumbnail);
   private:
   const std::string& _internal_jpegthumbnail() const;
@@ -13305,7 +13543,7 @@ class LiveLocationMessage final :
   public:
   void clear_contextinfo();
   const ::proto::ContextInfo& contextinfo() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ContextInfo* release_contextinfo();
+  PROTOBUF_NODISCARD ::proto::ContextInfo* release_contextinfo();
   ::proto::ContextInfo* mutable_contextinfo();
   void set_allocated_contextinfo(::proto::ContextInfo* contextinfo);
   private:
@@ -13348,11 +13586,11 @@ class LiveLocationMessage final :
   bool _internal_has_accuracyinmeters() const;
   public:
   void clear_accuracyinmeters();
-  ::PROTOBUF_NAMESPACE_ID::uint32 accuracyinmeters() const;
-  void set_accuracyinmeters(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t accuracyinmeters() const;
+  void set_accuracyinmeters(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_accuracyinmeters() const;
-  void _internal_set_accuracyinmeters(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_accuracyinmeters() const;
+  void _internal_set_accuracyinmeters(uint32_t value);
   public:
 
   // optional float speedInMps = 4;
@@ -13374,11 +13612,11 @@ class LiveLocationMessage final :
   bool _internal_has_degreesclockwisefrommagneticnorth() const;
   public:
   void clear_degreesclockwisefrommagneticnorth();
-  ::PROTOBUF_NAMESPACE_ID::uint32 degreesclockwisefrommagneticnorth() const;
-  void set_degreesclockwisefrommagneticnorth(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t degreesclockwisefrommagneticnorth() const;
+  void set_degreesclockwisefrommagneticnorth(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_degreesclockwisefrommagneticnorth() const;
-  void _internal_set_degreesclockwisefrommagneticnorth(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_degreesclockwisefrommagneticnorth() const;
+  void _internal_set_degreesclockwisefrommagneticnorth(uint32_t value);
   public:
 
   // optional uint32 timeOffset = 8;
@@ -13387,11 +13625,11 @@ class LiveLocationMessage final :
   bool _internal_has_timeoffset() const;
   public:
   void clear_timeoffset();
-  ::PROTOBUF_NAMESPACE_ID::uint32 timeoffset() const;
-  void set_timeoffset(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t timeoffset() const;
+  void set_timeoffset(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_timeoffset() const;
-  void _internal_set_timeoffset(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_timeoffset() const;
+  void _internal_set_timeoffset(uint32_t value);
   public:
 
   // optional int64 sequenceNumber = 7;
@@ -13400,11 +13638,11 @@ class LiveLocationMessage final :
   bool _internal_has_sequencenumber() const;
   public:
   void clear_sequencenumber();
-  ::PROTOBUF_NAMESPACE_ID::int64 sequencenumber() const;
-  void set_sequencenumber(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t sequencenumber() const;
+  void set_sequencenumber(int64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::int64 _internal_sequencenumber() const;
-  void _internal_set_sequencenumber(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t _internal_sequencenumber() const;
+  void _internal_set_sequencenumber(int64_t value);
   public:
 
   // @@protoc_insertion_point(class_scope:proto.LiveLocationMessage)
@@ -13414,18 +13652,21 @@ class LiveLocationMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr caption_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr jpegthumbnail_;
-  ::proto::ContextInfo* contextinfo_;
-  double degreeslatitude_;
-  double degreeslongitude_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 accuracyinmeters_;
-  float speedinmps_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 degreesclockwisefrommagneticnorth_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 timeoffset_;
-  ::PROTOBUF_NAMESPACE_ID::int64 sequencenumber_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr caption_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr jpegthumbnail_;
+    ::proto::ContextInfo* contextinfo_;
+    double degreeslatitude_;
+    double degreeslongitude_;
+    uint32_t accuracyinmeters_;
+    float speedinmps_;
+    uint32_t degreesclockwisefrommagneticnorth_;
+    uint32_t timeoffset_;
+    int64_t sequencenumber_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -13435,7 +13676,7 @@ class StickerMessage final :
  public:
   inline StickerMessage() : StickerMessage(nullptr) {}
   ~StickerMessage() override;
-  explicit constexpr StickerMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR StickerMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   StickerMessage(const StickerMessage& from);
   StickerMessage(StickerMessage&& from) noexcept
@@ -13492,7 +13733,12 @@ class StickerMessage final :
   }
   inline void Swap(StickerMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -13506,34 +13752,34 @@ class StickerMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline StickerMessage* New() const final {
-    return new StickerMessage();
-  }
-
-  StickerMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  StickerMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<StickerMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const StickerMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const StickerMessage& from);
+  void MergeFrom( const StickerMessage& from) {
+    StickerMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(StickerMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.StickerMessage";
@@ -13541,9 +13787,6 @@ class StickerMessage final :
   protected:
   explicit StickerMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -13582,7 +13825,7 @@ class StickerMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_url(ArgT0&& arg0, ArgT... args);
   std::string* mutable_url();
-  PROTOBUF_MUST_USE_RESULT std::string* release_url();
+  PROTOBUF_NODISCARD std::string* release_url();
   void set_allocated_url(std::string* url);
   private:
   const std::string& _internal_url() const;
@@ -13600,7 +13843,7 @@ class StickerMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_filesha256(ArgT0&& arg0, ArgT... args);
   std::string* mutable_filesha256();
-  PROTOBUF_MUST_USE_RESULT std::string* release_filesha256();
+  PROTOBUF_NODISCARD std::string* release_filesha256();
   void set_allocated_filesha256(std::string* filesha256);
   private:
   const std::string& _internal_filesha256() const;
@@ -13618,7 +13861,7 @@ class StickerMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_fileencsha256(ArgT0&& arg0, ArgT... args);
   std::string* mutable_fileencsha256();
-  PROTOBUF_MUST_USE_RESULT std::string* release_fileencsha256();
+  PROTOBUF_NODISCARD std::string* release_fileencsha256();
   void set_allocated_fileencsha256(std::string* fileencsha256);
   private:
   const std::string& _internal_fileencsha256() const;
@@ -13636,7 +13879,7 @@ class StickerMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_mediakey(ArgT0&& arg0, ArgT... args);
   std::string* mutable_mediakey();
-  PROTOBUF_MUST_USE_RESULT std::string* release_mediakey();
+  PROTOBUF_NODISCARD std::string* release_mediakey();
   void set_allocated_mediakey(std::string* mediakey);
   private:
   const std::string& _internal_mediakey() const;
@@ -13654,7 +13897,7 @@ class StickerMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_mimetype(ArgT0&& arg0, ArgT... args);
   std::string* mutable_mimetype();
-  PROTOBUF_MUST_USE_RESULT std::string* release_mimetype();
+  PROTOBUF_NODISCARD std::string* release_mimetype();
   void set_allocated_mimetype(std::string* mimetype);
   private:
   const std::string& _internal_mimetype() const;
@@ -13672,7 +13915,7 @@ class StickerMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_directpath(ArgT0&& arg0, ArgT... args);
   std::string* mutable_directpath();
-  PROTOBUF_MUST_USE_RESULT std::string* release_directpath();
+  PROTOBUF_NODISCARD std::string* release_directpath();
   void set_allocated_directpath(std::string* directpath);
   private:
   const std::string& _internal_directpath() const;
@@ -13690,7 +13933,7 @@ class StickerMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_firstframesidecar(ArgT0&& arg0, ArgT... args);
   std::string* mutable_firstframesidecar();
-  PROTOBUF_MUST_USE_RESULT std::string* release_firstframesidecar();
+  PROTOBUF_NODISCARD std::string* release_firstframesidecar();
   void set_allocated_firstframesidecar(std::string* firstframesidecar);
   private:
   const std::string& _internal_firstframesidecar() const;
@@ -13708,7 +13951,7 @@ class StickerMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_pngthumbnail(ArgT0&& arg0, ArgT... args);
   std::string* mutable_pngthumbnail();
-  PROTOBUF_MUST_USE_RESULT std::string* release_pngthumbnail();
+  PROTOBUF_NODISCARD std::string* release_pngthumbnail();
   void set_allocated_pngthumbnail(std::string* pngthumbnail);
   private:
   const std::string& _internal_pngthumbnail() const;
@@ -13723,7 +13966,7 @@ class StickerMessage final :
   public:
   void clear_contextinfo();
   const ::proto::ContextInfo& contextinfo() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ContextInfo* release_contextinfo();
+  PROTOBUF_NODISCARD ::proto::ContextInfo* release_contextinfo();
   ::proto::ContextInfo* mutable_contextinfo();
   void set_allocated_contextinfo(::proto::ContextInfo* contextinfo);
   private:
@@ -13740,11 +13983,11 @@ class StickerMessage final :
   bool _internal_has_height() const;
   public:
   void clear_height();
-  ::PROTOBUF_NAMESPACE_ID::uint32 height() const;
-  void set_height(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t height() const;
+  void set_height(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_height() const;
-  void _internal_set_height(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_height() const;
+  void _internal_set_height(uint32_t value);
   public:
 
   // optional uint32 width = 7;
@@ -13753,11 +13996,11 @@ class StickerMessage final :
   bool _internal_has_width() const;
   public:
   void clear_width();
-  ::PROTOBUF_NAMESPACE_ID::uint32 width() const;
-  void set_width(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t width() const;
+  void set_width(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_width() const;
-  void _internal_set_width(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_width() const;
+  void _internal_set_width(uint32_t value);
   public:
 
   // optional uint64 fileLength = 9;
@@ -13766,11 +14009,11 @@ class StickerMessage final :
   bool _internal_has_filelength() const;
   public:
   void clear_filelength();
-  ::PROTOBUF_NAMESPACE_ID::uint64 filelength() const;
-  void set_filelength(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t filelength() const;
+  void set_filelength(uint64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint64 _internal_filelength() const;
-  void _internal_set_filelength(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t _internal_filelength() const;
+  void _internal_set_filelength(uint64_t value);
   public:
 
   // optional int64 mediaKeyTimestamp = 10;
@@ -13779,11 +14022,11 @@ class StickerMessage final :
   bool _internal_has_mediakeytimestamp() const;
   public:
   void clear_mediakeytimestamp();
-  ::PROTOBUF_NAMESPACE_ID::int64 mediakeytimestamp() const;
-  void set_mediakeytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t mediakeytimestamp() const;
+  void set_mediakeytimestamp(int64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::int64 _internal_mediakeytimestamp() const;
-  void _internal_set_mediakeytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t _internal_mediakeytimestamp() const;
+  void _internal_set_mediakeytimestamp(int64_t value);
   public:
 
   // optional uint32 firstFrameLength = 11;
@@ -13792,11 +14035,11 @@ class StickerMessage final :
   bool _internal_has_firstframelength() const;
   public:
   void clear_firstframelength();
-  ::PROTOBUF_NAMESPACE_ID::uint32 firstframelength() const;
-  void set_firstframelength(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t firstframelength() const;
+  void set_firstframelength(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_firstframelength() const;
-  void _internal_set_firstframelength(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_firstframelength() const;
+  void _internal_set_firstframelength(uint32_t value);
   public:
 
   // optional bool isAnimated = 13;
@@ -13819,23 +14062,26 @@ class StickerMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr url_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr filesha256_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr fileencsha256_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr mediakey_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr mimetype_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr directpath_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr firstframesidecar_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr pngthumbnail_;
-  ::proto::ContextInfo* contextinfo_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 height_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 width_;
-  ::PROTOBUF_NAMESPACE_ID::uint64 filelength_;
-  ::PROTOBUF_NAMESPACE_ID::int64 mediakeytimestamp_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 firstframelength_;
-  bool isanimated_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr url_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr filesha256_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr fileencsha256_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr mediakey_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr mimetype_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr directpath_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr firstframesidecar_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr pngthumbnail_;
+    ::proto::ContextInfo* contextinfo_;
+    uint32_t height_;
+    uint32_t width_;
+    uint64_t filelength_;
+    int64_t mediakeytimestamp_;
+    uint32_t firstframelength_;
+    bool isanimated_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -13845,7 +14091,7 @@ class FourRowTemplate final :
  public:
   inline FourRowTemplate() : FourRowTemplate(nullptr) {}
   ~FourRowTemplate() override;
-  explicit constexpr FourRowTemplate(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR FourRowTemplate(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   FourRowTemplate(const FourRowTemplate& from);
   FourRowTemplate(FourRowTemplate&& from) noexcept
@@ -13911,7 +14157,12 @@ class FourRowTemplate final :
   }
   inline void Swap(FourRowTemplate* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -13925,34 +14176,34 @@ class FourRowTemplate final :
 
   // implements Message ----------------------------------------------
 
-  inline FourRowTemplate* New() const final {
-    return new FourRowTemplate();
-  }
-
-  FourRowTemplate* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  FourRowTemplate* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<FourRowTemplate>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const FourRowTemplate& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const FourRowTemplate& from);
+  void MergeFrom( const FourRowTemplate& from) {
+    FourRowTemplate::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(FourRowTemplate* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.FourRowTemplate";
@@ -13960,9 +14211,6 @@ class FourRowTemplate final :
   protected:
   explicit FourRowTemplate(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -14009,7 +14257,7 @@ class FourRowTemplate final :
   public:
   void clear_content();
   const ::proto::HighlyStructuredMessage& content() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::HighlyStructuredMessage* release_content();
+  PROTOBUF_NODISCARD ::proto::HighlyStructuredMessage* release_content();
   ::proto::HighlyStructuredMessage* mutable_content();
   void set_allocated_content(::proto::HighlyStructuredMessage* content);
   private:
@@ -14027,7 +14275,7 @@ class FourRowTemplate final :
   public:
   void clear_footer();
   const ::proto::HighlyStructuredMessage& footer() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::HighlyStructuredMessage* release_footer();
+  PROTOBUF_NODISCARD ::proto::HighlyStructuredMessage* release_footer();
   ::proto::HighlyStructuredMessage* mutable_footer();
   void set_allocated_footer(::proto::HighlyStructuredMessage* footer);
   private:
@@ -14045,7 +14293,7 @@ class FourRowTemplate final :
   public:
   void clear_documentmessage();
   const ::proto::DocumentMessage& documentmessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::DocumentMessage* release_documentmessage();
+  PROTOBUF_NODISCARD ::proto::DocumentMessage* release_documentmessage();
   ::proto::DocumentMessage* mutable_documentmessage();
   void set_allocated_documentmessage(::proto::DocumentMessage* documentmessage);
   private:
@@ -14063,7 +14311,7 @@ class FourRowTemplate final :
   public:
   void clear_highlystructuredmessage();
   const ::proto::HighlyStructuredMessage& highlystructuredmessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::HighlyStructuredMessage* release_highlystructuredmessage();
+  PROTOBUF_NODISCARD ::proto::HighlyStructuredMessage* release_highlystructuredmessage();
   ::proto::HighlyStructuredMessage* mutable_highlystructuredmessage();
   void set_allocated_highlystructuredmessage(::proto::HighlyStructuredMessage* highlystructuredmessage);
   private:
@@ -14081,7 +14329,7 @@ class FourRowTemplate final :
   public:
   void clear_imagemessage();
   const ::proto::ImageMessage& imagemessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ImageMessage* release_imagemessage();
+  PROTOBUF_NODISCARD ::proto::ImageMessage* release_imagemessage();
   ::proto::ImageMessage* mutable_imagemessage();
   void set_allocated_imagemessage(::proto::ImageMessage* imagemessage);
   private:
@@ -14099,7 +14347,7 @@ class FourRowTemplate final :
   public:
   void clear_videomessage();
   const ::proto::VideoMessage& videomessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::VideoMessage* release_videomessage();
+  PROTOBUF_NODISCARD ::proto::VideoMessage* release_videomessage();
   ::proto::VideoMessage* mutable_videomessage();
   void set_allocated_videomessage(::proto::VideoMessage* videomessage);
   private:
@@ -14117,7 +14365,7 @@ class FourRowTemplate final :
   public:
   void clear_locationmessage();
   const ::proto::LocationMessage& locationmessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::LocationMessage* release_locationmessage();
+  PROTOBUF_NODISCARD ::proto::LocationMessage* release_locationmessage();
   ::proto::LocationMessage* mutable_locationmessage();
   void set_allocated_locationmessage(::proto::LocationMessage* locationmessage);
   private:
@@ -14145,22 +14393,25 @@ class FourRowTemplate final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::TemplateButton > buttons_;
-  ::proto::HighlyStructuredMessage* content_;
-  ::proto::HighlyStructuredMessage* footer_;
-  union TitleUnion {
-    constexpr TitleUnion() : _constinit_{} {}
-      ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized _constinit_;
-    ::proto::DocumentMessage* documentmessage_;
-    ::proto::HighlyStructuredMessage* highlystructuredmessage_;
-    ::proto::ImageMessage* imagemessage_;
-    ::proto::VideoMessage* videomessage_;
-    ::proto::LocationMessage* locationmessage_;
-  } title_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 _oneof_case_[1];
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::TemplateButton > buttons_;
+    ::proto::HighlyStructuredMessage* content_;
+    ::proto::HighlyStructuredMessage* footer_;
+    union TitleUnion {
+      constexpr TitleUnion() : _constinit_{} {}
+        ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized _constinit_;
+      ::proto::DocumentMessage* documentmessage_;
+      ::proto::HighlyStructuredMessage* highlystructuredmessage_;
+      ::proto::ImageMessage* imagemessage_;
+      ::proto::VideoMessage* videomessage_;
+      ::proto::LocationMessage* locationmessage_;
+    } title_;
+    uint32_t _oneof_case_[1];
 
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -14170,7 +14421,7 @@ class HydratedFourRowTemplate final :
  public:
   inline HydratedFourRowTemplate() : HydratedFourRowTemplate(nullptr) {}
   ~HydratedFourRowTemplate() override;
-  explicit constexpr HydratedFourRowTemplate(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR HydratedFourRowTemplate(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   HydratedFourRowTemplate(const HydratedFourRowTemplate& from);
   HydratedFourRowTemplate(HydratedFourRowTemplate&& from) noexcept
@@ -14236,7 +14487,12 @@ class HydratedFourRowTemplate final :
   }
   inline void Swap(HydratedFourRowTemplate* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -14250,34 +14506,34 @@ class HydratedFourRowTemplate final :
 
   // implements Message ----------------------------------------------
 
-  inline HydratedFourRowTemplate* New() const final {
-    return new HydratedFourRowTemplate();
-  }
-
-  HydratedFourRowTemplate* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  HydratedFourRowTemplate* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<HydratedFourRowTemplate>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const HydratedFourRowTemplate& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const HydratedFourRowTemplate& from);
+  void MergeFrom( const HydratedFourRowTemplate& from) {
+    HydratedFourRowTemplate::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(HydratedFourRowTemplate* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.HydratedFourRowTemplate";
@@ -14285,9 +14541,6 @@ class HydratedFourRowTemplate final :
   protected:
   explicit HydratedFourRowTemplate(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -14338,7 +14591,7 @@ class HydratedFourRowTemplate final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_hydratedcontenttext(ArgT0&& arg0, ArgT... args);
   std::string* mutable_hydratedcontenttext();
-  PROTOBUF_MUST_USE_RESULT std::string* release_hydratedcontenttext();
+  PROTOBUF_NODISCARD std::string* release_hydratedcontenttext();
   void set_allocated_hydratedcontenttext(std::string* hydratedcontenttext);
   private:
   const std::string& _internal_hydratedcontenttext() const;
@@ -14356,7 +14609,7 @@ class HydratedFourRowTemplate final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_hydratedfootertext(ArgT0&& arg0, ArgT... args);
   std::string* mutable_hydratedfootertext();
-  PROTOBUF_MUST_USE_RESULT std::string* release_hydratedfootertext();
+  PROTOBUF_NODISCARD std::string* release_hydratedfootertext();
   void set_allocated_hydratedfootertext(std::string* hydratedfootertext);
   private:
   const std::string& _internal_hydratedfootertext() const;
@@ -14374,7 +14627,7 @@ class HydratedFourRowTemplate final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_templateid(ArgT0&& arg0, ArgT... args);
   std::string* mutable_templateid();
-  PROTOBUF_MUST_USE_RESULT std::string* release_templateid();
+  PROTOBUF_NODISCARD std::string* release_templateid();
   void set_allocated_templateid(std::string* templateid);
   private:
   const std::string& _internal_templateid() const;
@@ -14389,7 +14642,7 @@ class HydratedFourRowTemplate final :
   public:
   void clear_documentmessage();
   const ::proto::DocumentMessage& documentmessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::DocumentMessage* release_documentmessage();
+  PROTOBUF_NODISCARD ::proto::DocumentMessage* release_documentmessage();
   ::proto::DocumentMessage* mutable_documentmessage();
   void set_allocated_documentmessage(::proto::DocumentMessage* documentmessage);
   private:
@@ -14410,7 +14663,7 @@ class HydratedFourRowTemplate final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_hydratedtitletext(ArgT0&& arg0, ArgT... args);
   std::string* mutable_hydratedtitletext();
-  PROTOBUF_MUST_USE_RESULT std::string* release_hydratedtitletext();
+  PROTOBUF_NODISCARD std::string* release_hydratedtitletext();
   void set_allocated_hydratedtitletext(std::string* hydratedtitletext);
   private:
   const std::string& _internal_hydratedtitletext() const;
@@ -14425,7 +14678,7 @@ class HydratedFourRowTemplate final :
   public:
   void clear_imagemessage();
   const ::proto::ImageMessage& imagemessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ImageMessage* release_imagemessage();
+  PROTOBUF_NODISCARD ::proto::ImageMessage* release_imagemessage();
   ::proto::ImageMessage* mutable_imagemessage();
   void set_allocated_imagemessage(::proto::ImageMessage* imagemessage);
   private:
@@ -14443,7 +14696,7 @@ class HydratedFourRowTemplate final :
   public:
   void clear_videomessage();
   const ::proto::VideoMessage& videomessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::VideoMessage* release_videomessage();
+  PROTOBUF_NODISCARD ::proto::VideoMessage* release_videomessage();
   ::proto::VideoMessage* mutable_videomessage();
   void set_allocated_videomessage(::proto::VideoMessage* videomessage);
   private:
@@ -14461,7 +14714,7 @@ class HydratedFourRowTemplate final :
   public:
   void clear_locationmessage();
   const ::proto::LocationMessage& locationmessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::LocationMessage* release_locationmessage();
+  PROTOBUF_NODISCARD ::proto::LocationMessage* release_locationmessage();
   ::proto::LocationMessage* mutable_locationmessage();
   void set_allocated_locationmessage(::proto::LocationMessage* locationmessage);
   private:
@@ -14489,23 +14742,26 @@ class HydratedFourRowTemplate final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::HydratedTemplateButton > hydratedbuttons_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr hydratedcontenttext_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr hydratedfootertext_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr templateid_;
-  union TitleUnion {
-    constexpr TitleUnion() : _constinit_{} {}
-      ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized _constinit_;
-    ::proto::DocumentMessage* documentmessage_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr hydratedtitletext_;
-    ::proto::ImageMessage* imagemessage_;
-    ::proto::VideoMessage* videomessage_;
-    ::proto::LocationMessage* locationmessage_;
-  } title_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 _oneof_case_[1];
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::HydratedTemplateButton > hydratedbuttons_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr hydratedcontenttext_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr hydratedfootertext_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr templateid_;
+    union TitleUnion {
+      constexpr TitleUnion() : _constinit_{} {}
+        ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized _constinit_;
+      ::proto::DocumentMessage* documentmessage_;
+      ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr hydratedtitletext_;
+      ::proto::ImageMessage* imagemessage_;
+      ::proto::VideoMessage* videomessage_;
+      ::proto::LocationMessage* locationmessage_;
+    } title_;
+    uint32_t _oneof_case_[1];
 
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -14515,7 +14771,7 @@ class TemplateMessage final :
  public:
   inline TemplateMessage() : TemplateMessage(nullptr) {}
   ~TemplateMessage() override;
-  explicit constexpr TemplateMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR TemplateMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   TemplateMessage(const TemplateMessage& from);
   TemplateMessage(TemplateMessage&& from) noexcept
@@ -14578,7 +14834,12 @@ class TemplateMessage final :
   }
   inline void Swap(TemplateMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -14592,34 +14853,34 @@ class TemplateMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline TemplateMessage* New() const final {
-    return new TemplateMessage();
-  }
-
-  TemplateMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  TemplateMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<TemplateMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const TemplateMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const TemplateMessage& from);
+  void MergeFrom( const TemplateMessage& from) {
+    TemplateMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(TemplateMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.TemplateMessage";
@@ -14627,9 +14888,6 @@ class TemplateMessage final :
   protected:
   explicit TemplateMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -14654,7 +14912,7 @@ class TemplateMessage final :
   public:
   void clear_contextinfo();
   const ::proto::ContextInfo& contextinfo() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ContextInfo* release_contextinfo();
+  PROTOBUF_NODISCARD ::proto::ContextInfo* release_contextinfo();
   ::proto::ContextInfo* mutable_contextinfo();
   void set_allocated_contextinfo(::proto::ContextInfo* contextinfo);
   private:
@@ -14672,7 +14930,7 @@ class TemplateMessage final :
   public:
   void clear_hydratedtemplate();
   const ::proto::HydratedFourRowTemplate& hydratedtemplate() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::HydratedFourRowTemplate* release_hydratedtemplate();
+  PROTOBUF_NODISCARD ::proto::HydratedFourRowTemplate* release_hydratedtemplate();
   ::proto::HydratedFourRowTemplate* mutable_hydratedtemplate();
   void set_allocated_hydratedtemplate(::proto::HydratedFourRowTemplate* hydratedtemplate);
   private:
@@ -14690,7 +14948,7 @@ class TemplateMessage final :
   public:
   void clear_fourrowtemplate();
   const ::proto::FourRowTemplate& fourrowtemplate() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::FourRowTemplate* release_fourrowtemplate();
+  PROTOBUF_NODISCARD ::proto::FourRowTemplate* release_fourrowtemplate();
   ::proto::FourRowTemplate* mutable_fourrowtemplate();
   void set_allocated_fourrowtemplate(::proto::FourRowTemplate* fourrowtemplate);
   private:
@@ -14708,7 +14966,7 @@ class TemplateMessage final :
   public:
   void clear_hydratedfourrowtemplate();
   const ::proto::HydratedFourRowTemplate& hydratedfourrowtemplate() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::HydratedFourRowTemplate* release_hydratedfourrowtemplate();
+  PROTOBUF_NODISCARD ::proto::HydratedFourRowTemplate* release_hydratedfourrowtemplate();
   ::proto::HydratedFourRowTemplate* mutable_hydratedfourrowtemplate();
   void set_allocated_hydratedfourrowtemplate(::proto::HydratedFourRowTemplate* hydratedfourrowtemplate);
   private:
@@ -14733,18 +14991,21 @@ class TemplateMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::proto::ContextInfo* contextinfo_;
-  ::proto::HydratedFourRowTemplate* hydratedtemplate_;
-  union FormatUnion {
-    constexpr FormatUnion() : _constinit_{} {}
-      ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized _constinit_;
-    ::proto::FourRowTemplate* fourrowtemplate_;
-    ::proto::HydratedFourRowTemplate* hydratedfourrowtemplate_;
-  } format_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 _oneof_case_[1];
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::proto::ContextInfo* contextinfo_;
+    ::proto::HydratedFourRowTemplate* hydratedtemplate_;
+    union FormatUnion {
+      constexpr FormatUnion() : _constinit_{} {}
+        ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized _constinit_;
+      ::proto::FourRowTemplate* fourrowtemplate_;
+      ::proto::HydratedFourRowTemplate* hydratedfourrowtemplate_;
+    } format_;
+    uint32_t _oneof_case_[1];
 
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -14754,7 +15015,7 @@ class TemplateButtonReplyMessage final :
  public:
   inline TemplateButtonReplyMessage() : TemplateButtonReplyMessage(nullptr) {}
   ~TemplateButtonReplyMessage() override;
-  explicit constexpr TemplateButtonReplyMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR TemplateButtonReplyMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   TemplateButtonReplyMessage(const TemplateButtonReplyMessage& from);
   TemplateButtonReplyMessage(TemplateButtonReplyMessage&& from) noexcept
@@ -14811,7 +15072,12 @@ class TemplateButtonReplyMessage final :
   }
   inline void Swap(TemplateButtonReplyMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -14825,34 +15091,34 @@ class TemplateButtonReplyMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline TemplateButtonReplyMessage* New() const final {
-    return new TemplateButtonReplyMessage();
-  }
-
-  TemplateButtonReplyMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  TemplateButtonReplyMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<TemplateButtonReplyMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const TemplateButtonReplyMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const TemplateButtonReplyMessage& from);
+  void MergeFrom( const TemplateButtonReplyMessage& from) {
+    TemplateButtonReplyMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(TemplateButtonReplyMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.TemplateButtonReplyMessage";
@@ -14860,9 +15126,6 @@ class TemplateButtonReplyMessage final :
   protected:
   explicit TemplateButtonReplyMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -14890,7 +15153,7 @@ class TemplateButtonReplyMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_selectedid(ArgT0&& arg0, ArgT... args);
   std::string* mutable_selectedid();
-  PROTOBUF_MUST_USE_RESULT std::string* release_selectedid();
+  PROTOBUF_NODISCARD std::string* release_selectedid();
   void set_allocated_selectedid(std::string* selectedid);
   private:
   const std::string& _internal_selectedid() const;
@@ -14908,7 +15171,7 @@ class TemplateButtonReplyMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_selecteddisplaytext(ArgT0&& arg0, ArgT... args);
   std::string* mutable_selecteddisplaytext();
-  PROTOBUF_MUST_USE_RESULT std::string* release_selecteddisplaytext();
+  PROTOBUF_NODISCARD std::string* release_selecteddisplaytext();
   void set_allocated_selecteddisplaytext(std::string* selecteddisplaytext);
   private:
   const std::string& _internal_selecteddisplaytext() const;
@@ -14923,7 +15186,7 @@ class TemplateButtonReplyMessage final :
   public:
   void clear_contextinfo();
   const ::proto::ContextInfo& contextinfo() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ContextInfo* release_contextinfo();
+  PROTOBUF_NODISCARD ::proto::ContextInfo* release_contextinfo();
   ::proto::ContextInfo* mutable_contextinfo();
   void set_allocated_contextinfo(::proto::ContextInfo* contextinfo);
   private:
@@ -14940,11 +15203,11 @@ class TemplateButtonReplyMessage final :
   bool _internal_has_selectedindex() const;
   public:
   void clear_selectedindex();
-  ::PROTOBUF_NAMESPACE_ID::uint32 selectedindex() const;
-  void set_selectedindex(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t selectedindex() const;
+  void set_selectedindex(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_selectedindex() const;
-  void _internal_set_selectedindex(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_selectedindex() const;
+  void _internal_set_selectedindex(uint32_t value);
   public:
 
   // @@protoc_insertion_point(class_scope:proto.TemplateButtonReplyMessage)
@@ -14954,12 +15217,15 @@ class TemplateButtonReplyMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr selectedid_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr selecteddisplaytext_;
-  ::proto::ContextInfo* contextinfo_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 selectedindex_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr selectedid_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr selecteddisplaytext_;
+    ::proto::ContextInfo* contextinfo_;
+    uint32_t selectedindex_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -14969,7 +15235,7 @@ class CatalogSnapshot final :
  public:
   inline CatalogSnapshot() : CatalogSnapshot(nullptr) {}
   ~CatalogSnapshot() override;
-  explicit constexpr CatalogSnapshot(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR CatalogSnapshot(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   CatalogSnapshot(const CatalogSnapshot& from);
   CatalogSnapshot(CatalogSnapshot&& from) noexcept
@@ -15026,7 +15292,12 @@ class CatalogSnapshot final :
   }
   inline void Swap(CatalogSnapshot* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -15040,34 +15311,34 @@ class CatalogSnapshot final :
 
   // implements Message ----------------------------------------------
 
-  inline CatalogSnapshot* New() const final {
-    return new CatalogSnapshot();
-  }
-
-  CatalogSnapshot* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  CatalogSnapshot* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<CatalogSnapshot>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const CatalogSnapshot& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const CatalogSnapshot& from);
+  void MergeFrom( const CatalogSnapshot& from) {
+    CatalogSnapshot::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(CatalogSnapshot* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.CatalogSnapshot";
@@ -15075,9 +15346,6 @@ class CatalogSnapshot final :
   protected:
   explicit CatalogSnapshot(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -15104,7 +15372,7 @@ class CatalogSnapshot final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_title(ArgT0&& arg0, ArgT... args);
   std::string* mutable_title();
-  PROTOBUF_MUST_USE_RESULT std::string* release_title();
+  PROTOBUF_NODISCARD std::string* release_title();
   void set_allocated_title(std::string* title);
   private:
   const std::string& _internal_title() const;
@@ -15122,7 +15390,7 @@ class CatalogSnapshot final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_description(ArgT0&& arg0, ArgT... args);
   std::string* mutable_description();
-  PROTOBUF_MUST_USE_RESULT std::string* release_description();
+  PROTOBUF_NODISCARD std::string* release_description();
   void set_allocated_description(std::string* description);
   private:
   const std::string& _internal_description() const;
@@ -15137,7 +15405,7 @@ class CatalogSnapshot final :
   public:
   void clear_catalogimage();
   const ::proto::ImageMessage& catalogimage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ImageMessage* release_catalogimage();
+  PROTOBUF_NODISCARD ::proto::ImageMessage* release_catalogimage();
   ::proto::ImageMessage* mutable_catalogimage();
   void set_allocated_catalogimage(::proto::ImageMessage* catalogimage);
   private:
@@ -15155,11 +15423,14 @@ class CatalogSnapshot final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr title_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr description_;
-  ::proto::ImageMessage* catalogimage_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr title_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr description_;
+    ::proto::ImageMessage* catalogimage_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -15169,7 +15440,7 @@ class ProductSnapshot final :
  public:
   inline ProductSnapshot() : ProductSnapshot(nullptr) {}
   ~ProductSnapshot() override;
-  explicit constexpr ProductSnapshot(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR ProductSnapshot(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   ProductSnapshot(const ProductSnapshot& from);
   ProductSnapshot(ProductSnapshot&& from) noexcept
@@ -15226,7 +15497,12 @@ class ProductSnapshot final :
   }
   inline void Swap(ProductSnapshot* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -15240,34 +15516,34 @@ class ProductSnapshot final :
 
   // implements Message ----------------------------------------------
 
-  inline ProductSnapshot* New() const final {
-    return new ProductSnapshot();
-  }
-
-  ProductSnapshot* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  ProductSnapshot* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<ProductSnapshot>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const ProductSnapshot& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const ProductSnapshot& from);
+  void MergeFrom( const ProductSnapshot& from) {
+    ProductSnapshot::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(ProductSnapshot* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.ProductSnapshot";
@@ -15275,9 +15551,6 @@ class ProductSnapshot final :
   protected:
   explicit ProductSnapshot(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -15311,7 +15584,7 @@ class ProductSnapshot final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_productid(ArgT0&& arg0, ArgT... args);
   std::string* mutable_productid();
-  PROTOBUF_MUST_USE_RESULT std::string* release_productid();
+  PROTOBUF_NODISCARD std::string* release_productid();
   void set_allocated_productid(std::string* productid);
   private:
   const std::string& _internal_productid() const;
@@ -15329,7 +15602,7 @@ class ProductSnapshot final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_title(ArgT0&& arg0, ArgT... args);
   std::string* mutable_title();
-  PROTOBUF_MUST_USE_RESULT std::string* release_title();
+  PROTOBUF_NODISCARD std::string* release_title();
   void set_allocated_title(std::string* title);
   private:
   const std::string& _internal_title() const;
@@ -15347,7 +15620,7 @@ class ProductSnapshot final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_description(ArgT0&& arg0, ArgT... args);
   std::string* mutable_description();
-  PROTOBUF_MUST_USE_RESULT std::string* release_description();
+  PROTOBUF_NODISCARD std::string* release_description();
   void set_allocated_description(std::string* description);
   private:
   const std::string& _internal_description() const;
@@ -15365,7 +15638,7 @@ class ProductSnapshot final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_currencycode(ArgT0&& arg0, ArgT... args);
   std::string* mutable_currencycode();
-  PROTOBUF_MUST_USE_RESULT std::string* release_currencycode();
+  PROTOBUF_NODISCARD std::string* release_currencycode();
   void set_allocated_currencycode(std::string* currencycode);
   private:
   const std::string& _internal_currencycode() const;
@@ -15383,7 +15656,7 @@ class ProductSnapshot final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_retailerid(ArgT0&& arg0, ArgT... args);
   std::string* mutable_retailerid();
-  PROTOBUF_MUST_USE_RESULT std::string* release_retailerid();
+  PROTOBUF_NODISCARD std::string* release_retailerid();
   void set_allocated_retailerid(std::string* retailerid);
   private:
   const std::string& _internal_retailerid() const;
@@ -15401,7 +15674,7 @@ class ProductSnapshot final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_url(ArgT0&& arg0, ArgT... args);
   std::string* mutable_url();
-  PROTOBUF_MUST_USE_RESULT std::string* release_url();
+  PROTOBUF_NODISCARD std::string* release_url();
   void set_allocated_url(std::string* url);
   private:
   const std::string& _internal_url() const;
@@ -15419,7 +15692,7 @@ class ProductSnapshot final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_firstimageid(ArgT0&& arg0, ArgT... args);
   std::string* mutable_firstimageid();
-  PROTOBUF_MUST_USE_RESULT std::string* release_firstimageid();
+  PROTOBUF_NODISCARD std::string* release_firstimageid();
   void set_allocated_firstimageid(std::string* firstimageid);
   private:
   const std::string& _internal_firstimageid() const;
@@ -15434,7 +15707,7 @@ class ProductSnapshot final :
   public:
   void clear_productimage();
   const ::proto::ImageMessage& productimage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ImageMessage* release_productimage();
+  PROTOBUF_NODISCARD ::proto::ImageMessage* release_productimage();
   ::proto::ImageMessage* mutable_productimage();
   void set_allocated_productimage(::proto::ImageMessage* productimage);
   private:
@@ -15451,11 +15724,11 @@ class ProductSnapshot final :
   bool _internal_has_priceamount1000() const;
   public:
   void clear_priceamount1000();
-  ::PROTOBUF_NAMESPACE_ID::int64 priceamount1000() const;
-  void set_priceamount1000(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t priceamount1000() const;
+  void set_priceamount1000(int64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::int64 _internal_priceamount1000() const;
-  void _internal_set_priceamount1000(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t _internal_priceamount1000() const;
+  void _internal_set_priceamount1000(int64_t value);
   public:
 
   // optional uint32 productImageCount = 9;
@@ -15464,11 +15737,11 @@ class ProductSnapshot final :
   bool _internal_has_productimagecount() const;
   public:
   void clear_productimagecount();
-  ::PROTOBUF_NAMESPACE_ID::uint32 productimagecount() const;
-  void set_productimagecount(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t productimagecount() const;
+  void set_productimagecount(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_productimagecount() const;
-  void _internal_set_productimagecount(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_productimagecount() const;
+  void _internal_set_productimagecount(uint32_t value);
   public:
 
   // @@protoc_insertion_point(class_scope:proto.ProductSnapshot)
@@ -15478,18 +15751,21 @@ class ProductSnapshot final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr productid_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr title_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr description_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr currencycode_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr retailerid_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr url_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr firstimageid_;
-  ::proto::ImageMessage* productimage_;
-  ::PROTOBUF_NAMESPACE_ID::int64 priceamount1000_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 productimagecount_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr productid_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr title_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr description_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr currencycode_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr retailerid_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr url_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr firstimageid_;
+    ::proto::ImageMessage* productimage_;
+    int64_t priceamount1000_;
+    uint32_t productimagecount_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -15499,7 +15775,7 @@ class ProductMessage final :
  public:
   inline ProductMessage() : ProductMessage(nullptr) {}
   ~ProductMessage() override;
-  explicit constexpr ProductMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR ProductMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   ProductMessage(const ProductMessage& from);
   ProductMessage(ProductMessage&& from) noexcept
@@ -15556,7 +15832,12 @@ class ProductMessage final :
   }
   inline void Swap(ProductMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -15570,34 +15851,34 @@ class ProductMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline ProductMessage* New() const final {
-    return new ProductMessage();
-  }
-
-  ProductMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  ProductMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<ProductMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const ProductMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const ProductMessage& from);
+  void MergeFrom( const ProductMessage& from) {
+    ProductMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(ProductMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.ProductMessage";
@@ -15605,9 +15886,6 @@ class ProductMessage final :
   protected:
   explicit ProductMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -15635,7 +15913,7 @@ class ProductMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_businessownerjid(ArgT0&& arg0, ArgT... args);
   std::string* mutable_businessownerjid();
-  PROTOBUF_MUST_USE_RESULT std::string* release_businessownerjid();
+  PROTOBUF_NODISCARD std::string* release_businessownerjid();
   void set_allocated_businessownerjid(std::string* businessownerjid);
   private:
   const std::string& _internal_businessownerjid() const;
@@ -15650,7 +15928,7 @@ class ProductMessage final :
   public:
   void clear_product();
   const ::proto::ProductSnapshot& product() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ProductSnapshot* release_product();
+  PROTOBUF_NODISCARD ::proto::ProductSnapshot* release_product();
   ::proto::ProductSnapshot* mutable_product();
   void set_allocated_product(::proto::ProductSnapshot* product);
   private:
@@ -15668,7 +15946,7 @@ class ProductMessage final :
   public:
   void clear_catalog();
   const ::proto::CatalogSnapshot& catalog() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::CatalogSnapshot* release_catalog();
+  PROTOBUF_NODISCARD ::proto::CatalogSnapshot* release_catalog();
   ::proto::CatalogSnapshot* mutable_catalog();
   void set_allocated_catalog(::proto::CatalogSnapshot* catalog);
   private:
@@ -15686,7 +15964,7 @@ class ProductMessage final :
   public:
   void clear_contextinfo();
   const ::proto::ContextInfo& contextinfo() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ContextInfo* release_contextinfo();
+  PROTOBUF_NODISCARD ::proto::ContextInfo* release_contextinfo();
   ::proto::ContextInfo* mutable_contextinfo();
   void set_allocated_contextinfo(::proto::ContextInfo* contextinfo);
   private:
@@ -15704,12 +15982,15 @@ class ProductMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr businessownerjid_;
-  ::proto::ProductSnapshot* product_;
-  ::proto::CatalogSnapshot* catalog_;
-  ::proto::ContextInfo* contextinfo_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr businessownerjid_;
+    ::proto::ProductSnapshot* product_;
+    ::proto::CatalogSnapshot* catalog_;
+    ::proto::ContextInfo* contextinfo_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -15719,7 +16000,7 @@ class OrderMessage final :
  public:
   inline OrderMessage() : OrderMessage(nullptr) {}
   ~OrderMessage() override;
-  explicit constexpr OrderMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR OrderMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   OrderMessage(const OrderMessage& from);
   OrderMessage(OrderMessage&& from) noexcept
@@ -15776,7 +16057,12 @@ class OrderMessage final :
   }
   inline void Swap(OrderMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -15790,34 +16076,34 @@ class OrderMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline OrderMessage* New() const final {
-    return new OrderMessage();
-  }
-
-  OrderMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  OrderMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<OrderMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const OrderMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const OrderMessage& from);
+  void MergeFrom( const OrderMessage& from) {
+    OrderMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(OrderMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.OrderMessage";
@@ -15825,9 +16111,6 @@ class OrderMessage final :
   protected:
   explicit OrderMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -15919,7 +16202,7 @@ class OrderMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_orderid(ArgT0&& arg0, ArgT... args);
   std::string* mutable_orderid();
-  PROTOBUF_MUST_USE_RESULT std::string* release_orderid();
+  PROTOBUF_NODISCARD std::string* release_orderid();
   void set_allocated_orderid(std::string* orderid);
   private:
   const std::string& _internal_orderid() const;
@@ -15937,7 +16220,7 @@ class OrderMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_thumbnail(ArgT0&& arg0, ArgT... args);
   std::string* mutable_thumbnail();
-  PROTOBUF_MUST_USE_RESULT std::string* release_thumbnail();
+  PROTOBUF_NODISCARD std::string* release_thumbnail();
   void set_allocated_thumbnail(std::string* thumbnail);
   private:
   const std::string& _internal_thumbnail() const;
@@ -15955,7 +16238,7 @@ class OrderMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_message(ArgT0&& arg0, ArgT... args);
   std::string* mutable_message();
-  PROTOBUF_MUST_USE_RESULT std::string* release_message();
+  PROTOBUF_NODISCARD std::string* release_message();
   void set_allocated_message(std::string* message);
   private:
   const std::string& _internal_message() const;
@@ -15973,7 +16256,7 @@ class OrderMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_ordertitle(ArgT0&& arg0, ArgT... args);
   std::string* mutable_ordertitle();
-  PROTOBUF_MUST_USE_RESULT std::string* release_ordertitle();
+  PROTOBUF_NODISCARD std::string* release_ordertitle();
   void set_allocated_ordertitle(std::string* ordertitle);
   private:
   const std::string& _internal_ordertitle() const;
@@ -15991,7 +16274,7 @@ class OrderMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_sellerjid(ArgT0&& arg0, ArgT... args);
   std::string* mutable_sellerjid();
-  PROTOBUF_MUST_USE_RESULT std::string* release_sellerjid();
+  PROTOBUF_NODISCARD std::string* release_sellerjid();
   void set_allocated_sellerjid(std::string* sellerjid);
   private:
   const std::string& _internal_sellerjid() const;
@@ -16009,7 +16292,7 @@ class OrderMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_token(ArgT0&& arg0, ArgT... args);
   std::string* mutable_token();
-  PROTOBUF_MUST_USE_RESULT std::string* release_token();
+  PROTOBUF_NODISCARD std::string* release_token();
   void set_allocated_token(std::string* token);
   private:
   const std::string& _internal_token() const;
@@ -16027,7 +16310,7 @@ class OrderMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_totalcurrencycode(ArgT0&& arg0, ArgT... args);
   std::string* mutable_totalcurrencycode();
-  PROTOBUF_MUST_USE_RESULT std::string* release_totalcurrencycode();
+  PROTOBUF_NODISCARD std::string* release_totalcurrencycode();
   void set_allocated_totalcurrencycode(std::string* totalcurrencycode);
   private:
   const std::string& _internal_totalcurrencycode() const;
@@ -16042,7 +16325,7 @@ class OrderMessage final :
   public:
   void clear_contextinfo();
   const ::proto::ContextInfo& contextinfo() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ContextInfo* release_contextinfo();
+  PROTOBUF_NODISCARD ::proto::ContextInfo* release_contextinfo();
   ::proto::ContextInfo* mutable_contextinfo();
   void set_allocated_contextinfo(::proto::ContextInfo* contextinfo);
   private:
@@ -16059,11 +16342,11 @@ class OrderMessage final :
   bool _internal_has_totalamount1000() const;
   public:
   void clear_totalamount1000();
-  ::PROTOBUF_NAMESPACE_ID::int64 totalamount1000() const;
-  void set_totalamount1000(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t totalamount1000() const;
+  void set_totalamount1000(int64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::int64 _internal_totalamount1000() const;
-  void _internal_set_totalamount1000(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t _internal_totalamount1000() const;
+  void _internal_set_totalamount1000(int64_t value);
   public:
 
   // optional int32 itemCount = 3;
@@ -16072,11 +16355,11 @@ class OrderMessage final :
   bool _internal_has_itemcount() const;
   public:
   void clear_itemcount();
-  ::PROTOBUF_NAMESPACE_ID::int32 itemcount() const;
-  void set_itemcount(::PROTOBUF_NAMESPACE_ID::int32 value);
+  int32_t itemcount() const;
+  void set_itemcount(int32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::int32 _internal_itemcount() const;
-  void _internal_set_itemcount(::PROTOBUF_NAMESPACE_ID::int32 value);
+  int32_t _internal_itemcount() const;
+  void _internal_set_itemcount(int32_t value);
   public:
 
   // optional .proto.OrderMessage.OrderMessageOrderStatus status = 4;
@@ -16112,20 +16395,23 @@ class OrderMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr orderid_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr thumbnail_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr message_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr ordertitle_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr sellerjid_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr token_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr totalcurrencycode_;
-  ::proto::ContextInfo* contextinfo_;
-  ::PROTOBUF_NAMESPACE_ID::int64 totalamount1000_;
-  ::PROTOBUF_NAMESPACE_ID::int32 itemcount_;
-  int status_;
-  int surface_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr orderid_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr thumbnail_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr message_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr ordertitle_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr sellerjid_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr token_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr totalcurrencycode_;
+    ::proto::ContextInfo* contextinfo_;
+    int64_t totalamount1000_;
+    int32_t itemcount_;
+    int status_;
+    int surface_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -16135,7 +16421,7 @@ class Row final :
  public:
   inline Row() : Row(nullptr) {}
   ~Row() override;
-  explicit constexpr Row(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR Row(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   Row(const Row& from);
   Row(Row&& from) noexcept
@@ -16192,7 +16478,12 @@ class Row final :
   }
   inline void Swap(Row* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -16206,34 +16497,34 @@ class Row final :
 
   // implements Message ----------------------------------------------
 
-  inline Row* New() const final {
-    return new Row();
-  }
-
-  Row* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  Row* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<Row>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const Row& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const Row& from);
+  void MergeFrom( const Row& from) {
+    Row::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(Row* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.Row";
@@ -16241,9 +16532,6 @@ class Row final :
   protected:
   explicit Row(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -16270,7 +16558,7 @@ class Row final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_title(ArgT0&& arg0, ArgT... args);
   std::string* mutable_title();
-  PROTOBUF_MUST_USE_RESULT std::string* release_title();
+  PROTOBUF_NODISCARD std::string* release_title();
   void set_allocated_title(std::string* title);
   private:
   const std::string& _internal_title() const;
@@ -16288,7 +16576,7 @@ class Row final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_description(ArgT0&& arg0, ArgT... args);
   std::string* mutable_description();
-  PROTOBUF_MUST_USE_RESULT std::string* release_description();
+  PROTOBUF_NODISCARD std::string* release_description();
   void set_allocated_description(std::string* description);
   private:
   const std::string& _internal_description() const;
@@ -16306,7 +16594,7 @@ class Row final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_rowid(ArgT0&& arg0, ArgT... args);
   std::string* mutable_rowid();
-  PROTOBUF_MUST_USE_RESULT std::string* release_rowid();
+  PROTOBUF_NODISCARD std::string* release_rowid();
   void set_allocated_rowid(std::string* rowid);
   private:
   const std::string& _internal_rowid() const;
@@ -16321,11 +16609,14 @@ class Row final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr title_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr description_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr rowid_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr title_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr description_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr rowid_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -16335,7 +16626,7 @@ class Section final :
  public:
   inline Section() : Section(nullptr) {}
   ~Section() override;
-  explicit constexpr Section(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR Section(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   Section(const Section& from);
   Section(Section&& from) noexcept
@@ -16392,7 +16683,12 @@ class Section final :
   }
   inline void Swap(Section* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -16406,34 +16702,34 @@ class Section final :
 
   // implements Message ----------------------------------------------
 
-  inline Section* New() const final {
-    return new Section();
-  }
-
-  Section* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  Section* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<Section>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const Section& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const Section& from);
+  void MergeFrom( const Section& from) {
+    Section::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(Section* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.Section";
@@ -16441,9 +16737,6 @@ class Section final :
   protected:
   explicit Section(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -16487,7 +16780,7 @@ class Section final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_title(ArgT0&& arg0, ArgT... args);
   std::string* mutable_title();
-  PROTOBUF_MUST_USE_RESULT std::string* release_title();
+  PROTOBUF_NODISCARD std::string* release_title();
   void set_allocated_title(std::string* title);
   private:
   const std::string& _internal_title() const;
@@ -16502,10 +16795,13 @@ class Section final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::Row > rows_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr title_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::Row > rows_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr title_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -16515,7 +16811,7 @@ class ListMessage final :
  public:
   inline ListMessage() : ListMessage(nullptr) {}
   ~ListMessage() override;
-  explicit constexpr ListMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR ListMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   ListMessage(const ListMessage& from);
   ListMessage(ListMessage&& from) noexcept
@@ -16572,7 +16868,12 @@ class ListMessage final :
   }
   inline void Swap(ListMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -16586,34 +16887,34 @@ class ListMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline ListMessage* New() const final {
-    return new ListMessage();
-  }
-
-  ListMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  ListMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<ListMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const ListMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const ListMessage& from);
+  void MergeFrom( const ListMessage& from) {
+    ListMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(ListMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.ListMessage";
@@ -16621,9 +16922,6 @@ class ListMessage final :
   protected:
   explicit ListMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -16700,7 +16998,7 @@ class ListMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_title(ArgT0&& arg0, ArgT... args);
   std::string* mutable_title();
-  PROTOBUF_MUST_USE_RESULT std::string* release_title();
+  PROTOBUF_NODISCARD std::string* release_title();
   void set_allocated_title(std::string* title);
   private:
   const std::string& _internal_title() const;
@@ -16718,7 +17016,7 @@ class ListMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_description(ArgT0&& arg0, ArgT... args);
   std::string* mutable_description();
-  PROTOBUF_MUST_USE_RESULT std::string* release_description();
+  PROTOBUF_NODISCARD std::string* release_description();
   void set_allocated_description(std::string* description);
   private:
   const std::string& _internal_description() const;
@@ -16736,7 +17034,7 @@ class ListMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_buttontext(ArgT0&& arg0, ArgT... args);
   std::string* mutable_buttontext();
-  PROTOBUF_MUST_USE_RESULT std::string* release_buttontext();
+  PROTOBUF_NODISCARD std::string* release_buttontext();
   void set_allocated_buttontext(std::string* buttontext);
   private:
   const std::string& _internal_buttontext() const;
@@ -16764,13 +17062,16 @@ class ListMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::Section > sections_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr title_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr description_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr buttontext_;
-  int listtype_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::Section > sections_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr title_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr description_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr buttontext_;
+    int listtype_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -16780,7 +17081,7 @@ class SingleSelectReply final :
  public:
   inline SingleSelectReply() : SingleSelectReply(nullptr) {}
   ~SingleSelectReply() override;
-  explicit constexpr SingleSelectReply(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR SingleSelectReply(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   SingleSelectReply(const SingleSelectReply& from);
   SingleSelectReply(SingleSelectReply&& from) noexcept
@@ -16837,7 +17138,12 @@ class SingleSelectReply final :
   }
   inline void Swap(SingleSelectReply* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -16851,34 +17157,34 @@ class SingleSelectReply final :
 
   // implements Message ----------------------------------------------
 
-  inline SingleSelectReply* New() const final {
-    return new SingleSelectReply();
-  }
-
-  SingleSelectReply* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  SingleSelectReply* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<SingleSelectReply>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const SingleSelectReply& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const SingleSelectReply& from);
+  void MergeFrom( const SingleSelectReply& from) {
+    SingleSelectReply::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(SingleSelectReply* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.SingleSelectReply";
@@ -16886,9 +17192,6 @@ class SingleSelectReply final :
   protected:
   explicit SingleSelectReply(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -16913,7 +17216,7 @@ class SingleSelectReply final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_selectedrowid(ArgT0&& arg0, ArgT... args);
   std::string* mutable_selectedrowid();
-  PROTOBUF_MUST_USE_RESULT std::string* release_selectedrowid();
+  PROTOBUF_NODISCARD std::string* release_selectedrowid();
   void set_allocated_selectedrowid(std::string* selectedrowid);
   private:
   const std::string& _internal_selectedrowid() const;
@@ -16928,9 +17231,12 @@ class SingleSelectReply final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr selectedrowid_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr selectedrowid_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -16940,7 +17246,7 @@ class ListResponseMessage final :
  public:
   inline ListResponseMessage() : ListResponseMessage(nullptr) {}
   ~ListResponseMessage() override;
-  explicit constexpr ListResponseMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR ListResponseMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   ListResponseMessage(const ListResponseMessage& from);
   ListResponseMessage(ListResponseMessage&& from) noexcept
@@ -16997,7 +17303,12 @@ class ListResponseMessage final :
   }
   inline void Swap(ListResponseMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -17011,34 +17322,34 @@ class ListResponseMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline ListResponseMessage* New() const final {
-    return new ListResponseMessage();
-  }
-
-  ListResponseMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  ListResponseMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<ListResponseMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const ListResponseMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const ListResponseMessage& from);
+  void MergeFrom( const ListResponseMessage& from) {
+    ListResponseMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(ListResponseMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.ListResponseMessage";
@@ -17046,9 +17357,6 @@ class ListResponseMessage final :
   protected:
   explicit ListResponseMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -17107,7 +17415,7 @@ class ListResponseMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_title(ArgT0&& arg0, ArgT... args);
   std::string* mutable_title();
-  PROTOBUF_MUST_USE_RESULT std::string* release_title();
+  PROTOBUF_NODISCARD std::string* release_title();
   void set_allocated_title(std::string* title);
   private:
   const std::string& _internal_title() const;
@@ -17125,7 +17433,7 @@ class ListResponseMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_description(ArgT0&& arg0, ArgT... args);
   std::string* mutable_description();
-  PROTOBUF_MUST_USE_RESULT std::string* release_description();
+  PROTOBUF_NODISCARD std::string* release_description();
   void set_allocated_description(std::string* description);
   private:
   const std::string& _internal_description() const;
@@ -17140,7 +17448,7 @@ class ListResponseMessage final :
   public:
   void clear_singleselectreply();
   const ::proto::SingleSelectReply& singleselectreply() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::SingleSelectReply* release_singleselectreply();
+  PROTOBUF_NODISCARD ::proto::SingleSelectReply* release_singleselectreply();
   ::proto::SingleSelectReply* mutable_singleselectreply();
   void set_allocated_singleselectreply(::proto::SingleSelectReply* singleselectreply);
   private:
@@ -17158,7 +17466,7 @@ class ListResponseMessage final :
   public:
   void clear_contextinfo();
   const ::proto::ContextInfo& contextinfo() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ContextInfo* release_contextinfo();
+  PROTOBUF_NODISCARD ::proto::ContextInfo* release_contextinfo();
   ::proto::ContextInfo* mutable_contextinfo();
   void set_allocated_contextinfo(::proto::ContextInfo* contextinfo);
   private:
@@ -17189,13 +17497,16 @@ class ListResponseMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr title_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr description_;
-  ::proto::SingleSelectReply* singleselectreply_;
-  ::proto::ContextInfo* contextinfo_;
-  int listtype_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr title_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr description_;
+    ::proto::SingleSelectReply* singleselectreply_;
+    ::proto::ContextInfo* contextinfo_;
+    int listtype_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -17205,7 +17516,7 @@ class GroupInviteMessage final :
  public:
   inline GroupInviteMessage() : GroupInviteMessage(nullptr) {}
   ~GroupInviteMessage() override;
-  explicit constexpr GroupInviteMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR GroupInviteMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   GroupInviteMessage(const GroupInviteMessage& from);
   GroupInviteMessage(GroupInviteMessage&& from) noexcept
@@ -17262,7 +17573,12 @@ class GroupInviteMessage final :
   }
   inline void Swap(GroupInviteMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -17276,34 +17592,34 @@ class GroupInviteMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline GroupInviteMessage* New() const final {
-    return new GroupInviteMessage();
-  }
-
-  GroupInviteMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  GroupInviteMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<GroupInviteMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const GroupInviteMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const GroupInviteMessage& from);
+  void MergeFrom( const GroupInviteMessage& from) {
+    GroupInviteMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(GroupInviteMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.GroupInviteMessage";
@@ -17311,9 +17627,6 @@ class GroupInviteMessage final :
   protected:
   explicit GroupInviteMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -17344,7 +17657,7 @@ class GroupInviteMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_groupjid(ArgT0&& arg0, ArgT... args);
   std::string* mutable_groupjid();
-  PROTOBUF_MUST_USE_RESULT std::string* release_groupjid();
+  PROTOBUF_NODISCARD std::string* release_groupjid();
   void set_allocated_groupjid(std::string* groupjid);
   private:
   const std::string& _internal_groupjid() const;
@@ -17362,7 +17675,7 @@ class GroupInviteMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_invitecode(ArgT0&& arg0, ArgT... args);
   std::string* mutable_invitecode();
-  PROTOBUF_MUST_USE_RESULT std::string* release_invitecode();
+  PROTOBUF_NODISCARD std::string* release_invitecode();
   void set_allocated_invitecode(std::string* invitecode);
   private:
   const std::string& _internal_invitecode() const;
@@ -17380,7 +17693,7 @@ class GroupInviteMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_groupname(ArgT0&& arg0, ArgT... args);
   std::string* mutable_groupname();
-  PROTOBUF_MUST_USE_RESULT std::string* release_groupname();
+  PROTOBUF_NODISCARD std::string* release_groupname();
   void set_allocated_groupname(std::string* groupname);
   private:
   const std::string& _internal_groupname() const;
@@ -17398,7 +17711,7 @@ class GroupInviteMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_jpegthumbnail(ArgT0&& arg0, ArgT... args);
   std::string* mutable_jpegthumbnail();
-  PROTOBUF_MUST_USE_RESULT std::string* release_jpegthumbnail();
+  PROTOBUF_NODISCARD std::string* release_jpegthumbnail();
   void set_allocated_jpegthumbnail(std::string* jpegthumbnail);
   private:
   const std::string& _internal_jpegthumbnail() const;
@@ -17416,7 +17729,7 @@ class GroupInviteMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_caption(ArgT0&& arg0, ArgT... args);
   std::string* mutable_caption();
-  PROTOBUF_MUST_USE_RESULT std::string* release_caption();
+  PROTOBUF_NODISCARD std::string* release_caption();
   void set_allocated_caption(std::string* caption);
   private:
   const std::string& _internal_caption() const;
@@ -17431,7 +17744,7 @@ class GroupInviteMessage final :
   public:
   void clear_contextinfo();
   const ::proto::ContextInfo& contextinfo() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ContextInfo* release_contextinfo();
+  PROTOBUF_NODISCARD ::proto::ContextInfo* release_contextinfo();
   ::proto::ContextInfo* mutable_contextinfo();
   void set_allocated_contextinfo(::proto::ContextInfo* contextinfo);
   private:
@@ -17448,11 +17761,11 @@ class GroupInviteMessage final :
   bool _internal_has_inviteexpiration() const;
   public:
   void clear_inviteexpiration();
-  ::PROTOBUF_NAMESPACE_ID::int64 inviteexpiration() const;
-  void set_inviteexpiration(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t inviteexpiration() const;
+  void set_inviteexpiration(int64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::int64 _internal_inviteexpiration() const;
-  void _internal_set_inviteexpiration(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t _internal_inviteexpiration() const;
+  void _internal_set_inviteexpiration(int64_t value);
   public:
 
   // @@protoc_insertion_point(class_scope:proto.GroupInviteMessage)
@@ -17462,15 +17775,18 @@ class GroupInviteMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr groupjid_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr invitecode_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr groupname_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr jpegthumbnail_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr caption_;
-  ::proto::ContextInfo* contextinfo_;
-  ::PROTOBUF_NAMESPACE_ID::int64 inviteexpiration_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr groupjid_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr invitecode_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr groupname_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr jpegthumbnail_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr caption_;
+    ::proto::ContextInfo* contextinfo_;
+    int64_t inviteexpiration_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -17480,7 +17796,7 @@ class EphemeralSetting final :
  public:
   inline EphemeralSetting() : EphemeralSetting(nullptr) {}
   ~EphemeralSetting() override;
-  explicit constexpr EphemeralSetting(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR EphemeralSetting(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   EphemeralSetting(const EphemeralSetting& from);
   EphemeralSetting(EphemeralSetting&& from) noexcept
@@ -17537,7 +17853,12 @@ class EphemeralSetting final :
   }
   inline void Swap(EphemeralSetting* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -17551,34 +17872,34 @@ class EphemeralSetting final :
 
   // implements Message ----------------------------------------------
 
-  inline EphemeralSetting* New() const final {
-    return new EphemeralSetting();
-  }
-
-  EphemeralSetting* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  EphemeralSetting* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<EphemeralSetting>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const EphemeralSetting& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const EphemeralSetting& from);
+  void MergeFrom( const EphemeralSetting& from) {
+    EphemeralSetting::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(EphemeralSetting* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.EphemeralSetting";
@@ -17586,9 +17907,6 @@ class EphemeralSetting final :
   protected:
   explicit EphemeralSetting(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -17615,7 +17933,7 @@ class EphemeralSetting final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_chatjid(ArgT0&& arg0, ArgT... args);
   std::string* mutable_chatjid();
-  PROTOBUF_MUST_USE_RESULT std::string* release_chatjid();
+  PROTOBUF_NODISCARD std::string* release_chatjid();
   void set_allocated_chatjid(std::string* chatjid);
   private:
   const std::string& _internal_chatjid() const;
@@ -17629,11 +17947,11 @@ class EphemeralSetting final :
   bool _internal_has_ephemeralsettingtimestamp() const;
   public:
   void clear_ephemeralsettingtimestamp();
-  ::PROTOBUF_NAMESPACE_ID::int64 ephemeralsettingtimestamp() const;
-  void set_ephemeralsettingtimestamp(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t ephemeralsettingtimestamp() const;
+  void set_ephemeralsettingtimestamp(int64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::int64 _internal_ephemeralsettingtimestamp() const;
-  void _internal_set_ephemeralsettingtimestamp(::PROTOBUF_NAMESPACE_ID::int64 value);
+  int64_t _internal_ephemeralsettingtimestamp() const;
+  void _internal_set_ephemeralsettingtimestamp(int64_t value);
   public:
 
   // optional uint32 ephemeralExpiration = 2;
@@ -17642,11 +17960,11 @@ class EphemeralSetting final :
   bool _internal_has_ephemeralexpiration() const;
   public:
   void clear_ephemeralexpiration();
-  ::PROTOBUF_NAMESPACE_ID::uint32 ephemeralexpiration() const;
-  void set_ephemeralexpiration(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t ephemeralexpiration() const;
+  void set_ephemeralexpiration(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_ephemeralexpiration() const;
-  void _internal_set_ephemeralexpiration(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_ephemeralexpiration() const;
+  void _internal_set_ephemeralexpiration(uint32_t value);
   public:
 
   // @@protoc_insertion_point(class_scope:proto.EphemeralSetting)
@@ -17656,11 +17974,14 @@ class EphemeralSetting final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr chatjid_;
-  ::PROTOBUF_NAMESPACE_ID::int64 ephemeralsettingtimestamp_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 ephemeralexpiration_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr chatjid_;
+    int64_t ephemeralsettingtimestamp_;
+    uint32_t ephemeralexpiration_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -17670,7 +17991,7 @@ class DeviceSentMessage final :
  public:
   inline DeviceSentMessage() : DeviceSentMessage(nullptr) {}
   ~DeviceSentMessage() override;
-  explicit constexpr DeviceSentMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR DeviceSentMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   DeviceSentMessage(const DeviceSentMessage& from);
   DeviceSentMessage(DeviceSentMessage&& from) noexcept
@@ -17727,7 +18048,12 @@ class DeviceSentMessage final :
   }
   inline void Swap(DeviceSentMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -17741,34 +18067,34 @@ class DeviceSentMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline DeviceSentMessage* New() const final {
-    return new DeviceSentMessage();
-  }
-
-  DeviceSentMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  DeviceSentMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<DeviceSentMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const DeviceSentMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const DeviceSentMessage& from);
+  void MergeFrom( const DeviceSentMessage& from) {
+    DeviceSentMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(DeviceSentMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.DeviceSentMessage";
@@ -17776,9 +18102,6 @@ class DeviceSentMessage final :
   protected:
   explicit DeviceSentMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -17824,7 +18147,7 @@ class DeviceSentMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_destinationjid(ArgT0&& arg0, ArgT... args);
   std::string* mutable_destinationjid();
-  PROTOBUF_MUST_USE_RESULT std::string* release_destinationjid();
+  PROTOBUF_NODISCARD std::string* release_destinationjid();
   void set_allocated_destinationjid(std::string* destinationjid);
   private:
   const std::string& _internal_destinationjid() const;
@@ -17842,7 +18165,7 @@ class DeviceSentMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_phash(ArgT0&& arg0, ArgT... args);
   std::string* mutable_phash();
-  PROTOBUF_MUST_USE_RESULT std::string* release_phash();
+  PROTOBUF_NODISCARD std::string* release_phash();
   void set_allocated_phash(std::string* phash);
   private:
   const std::string& _internal_phash() const;
@@ -17857,7 +18180,7 @@ class DeviceSentMessage final :
   public:
   void clear_message();
   const ::proto::Message& message() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::Message* release_message();
+  PROTOBUF_NODISCARD ::proto::Message* release_message();
   ::proto::Message* mutable_message();
   void set_allocated_message(::proto::Message* message);
   private:
@@ -17875,12 +18198,15 @@ class DeviceSentMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::EphemeralSetting > broadcastephemeralsettings_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr destinationjid_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr phash_;
-  ::proto::Message* message_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::EphemeralSetting > broadcastephemeralsettings_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr destinationjid_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr phash_;
+    ::proto::Message* message_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -17890,7 +18216,7 @@ class FutureProofMessage final :
  public:
   inline FutureProofMessage() : FutureProofMessage(nullptr) {}
   ~FutureProofMessage() override;
-  explicit constexpr FutureProofMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR FutureProofMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   FutureProofMessage(const FutureProofMessage& from);
   FutureProofMessage(FutureProofMessage&& from) noexcept
@@ -17947,7 +18273,12 @@ class FutureProofMessage final :
   }
   inline void Swap(FutureProofMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -17961,34 +18292,34 @@ class FutureProofMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline FutureProofMessage* New() const final {
-    return new FutureProofMessage();
-  }
-
-  FutureProofMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  FutureProofMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<FutureProofMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const FutureProofMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const FutureProofMessage& from);
+  void MergeFrom( const FutureProofMessage& from) {
+    FutureProofMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(FutureProofMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.FutureProofMessage";
@@ -17996,9 +18327,6 @@ class FutureProofMessage final :
   protected:
   explicit FutureProofMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -18020,7 +18348,7 @@ class FutureProofMessage final :
   public:
   void clear_message();
   const ::proto::Message& message() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::Message* release_message();
+  PROTOBUF_NODISCARD ::proto::Message* release_message();
   ::proto::Message* mutable_message();
   void set_allocated_message(::proto::Message* message);
   private:
@@ -18038,9 +18366,12 @@ class FutureProofMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::proto::Message* message_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::proto::Message* message_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -18050,7 +18381,7 @@ class ButtonText final :
  public:
   inline ButtonText() : ButtonText(nullptr) {}
   ~ButtonText() override;
-  explicit constexpr ButtonText(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR ButtonText(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   ButtonText(const ButtonText& from);
   ButtonText(ButtonText&& from) noexcept
@@ -18107,7 +18438,12 @@ class ButtonText final :
   }
   inline void Swap(ButtonText* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -18121,34 +18457,34 @@ class ButtonText final :
 
   // implements Message ----------------------------------------------
 
-  inline ButtonText* New() const final {
-    return new ButtonText();
-  }
-
-  ButtonText* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  ButtonText* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<ButtonText>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const ButtonText& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const ButtonText& from);
+  void MergeFrom( const ButtonText& from) {
+    ButtonText::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(ButtonText* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.ButtonText";
@@ -18156,9 +18492,6 @@ class ButtonText final :
   protected:
   explicit ButtonText(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -18183,7 +18516,7 @@ class ButtonText final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_displaytext(ArgT0&& arg0, ArgT... args);
   std::string* mutable_displaytext();
-  PROTOBUF_MUST_USE_RESULT std::string* release_displaytext();
+  PROTOBUF_NODISCARD std::string* release_displaytext();
   void set_allocated_displaytext(std::string* displaytext);
   private:
   const std::string& _internal_displaytext() const;
@@ -18198,9 +18531,12 @@ class ButtonText final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr displaytext_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr displaytext_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -18210,7 +18546,7 @@ class Button final :
  public:
   inline Button() : Button(nullptr) {}
   ~Button() override;
-  explicit constexpr Button(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR Button(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   Button(const Button& from);
   Button(Button&& from) noexcept
@@ -18267,7 +18603,12 @@ class Button final :
   }
   inline void Swap(Button* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -18281,34 +18622,34 @@ class Button final :
 
   // implements Message ----------------------------------------------
 
-  inline Button* New() const final {
-    return new Button();
-  }
-
-  Button* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  Button* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<Button>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const Button& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const Button& from);
+  void MergeFrom( const Button& from) {
+    Button::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(Button* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.Button";
@@ -18316,9 +18657,6 @@ class Button final :
   protected:
   explicit Button(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -18375,7 +18713,7 @@ class Button final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_buttonid(ArgT0&& arg0, ArgT... args);
   std::string* mutable_buttonid();
-  PROTOBUF_MUST_USE_RESULT std::string* release_buttonid();
+  PROTOBUF_NODISCARD std::string* release_buttonid();
   void set_allocated_buttonid(std::string* buttonid);
   private:
   const std::string& _internal_buttonid() const;
@@ -18390,7 +18728,7 @@ class Button final :
   public:
   void clear_buttontext();
   const ::proto::ButtonText& buttontext() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ButtonText* release_buttontext();
+  PROTOBUF_NODISCARD ::proto::ButtonText* release_buttontext();
   ::proto::ButtonText* mutable_buttontext();
   void set_allocated_buttontext(::proto::ButtonText* buttontext);
   private:
@@ -18421,11 +18759,14 @@ class Button final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr buttonid_;
-  ::proto::ButtonText* buttontext_;
-  int type_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr buttonid_;
+    ::proto::ButtonText* buttontext_;
+    int type_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -18435,7 +18776,7 @@ class ButtonsMessage final :
  public:
   inline ButtonsMessage() : ButtonsMessage(nullptr) {}
   ~ButtonsMessage() override;
-  explicit constexpr ButtonsMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR ButtonsMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   ButtonsMessage(const ButtonsMessage& from);
   ButtonsMessage(ButtonsMessage&& from) noexcept
@@ -18501,7 +18842,12 @@ class ButtonsMessage final :
   }
   inline void Swap(ButtonsMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -18515,34 +18861,34 @@ class ButtonsMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline ButtonsMessage* New() const final {
-    return new ButtonsMessage();
-  }
-
-  ButtonsMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  ButtonsMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<ButtonsMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const ButtonsMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const ButtonsMessage& from);
+  void MergeFrom( const ButtonsMessage& from) {
+    ButtonsMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(ButtonsMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.ButtonsMessage";
@@ -18550,9 +18896,6 @@ class ButtonsMessage final :
   protected:
   explicit ButtonsMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -18644,7 +18987,7 @@ class ButtonsMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_contenttext(ArgT0&& arg0, ArgT... args);
   std::string* mutable_contenttext();
-  PROTOBUF_MUST_USE_RESULT std::string* release_contenttext();
+  PROTOBUF_NODISCARD std::string* release_contenttext();
   void set_allocated_contenttext(std::string* contenttext);
   private:
   const std::string& _internal_contenttext() const;
@@ -18662,7 +19005,7 @@ class ButtonsMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_footertext(ArgT0&& arg0, ArgT... args);
   std::string* mutable_footertext();
-  PROTOBUF_MUST_USE_RESULT std::string* release_footertext();
+  PROTOBUF_NODISCARD std::string* release_footertext();
   void set_allocated_footertext(std::string* footertext);
   private:
   const std::string& _internal_footertext() const;
@@ -18677,7 +19020,7 @@ class ButtonsMessage final :
   public:
   void clear_contextinfo();
   const ::proto::ContextInfo& contextinfo() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ContextInfo* release_contextinfo();
+  PROTOBUF_NODISCARD ::proto::ContextInfo* release_contextinfo();
   ::proto::ContextInfo* mutable_contextinfo();
   void set_allocated_contextinfo(::proto::ContextInfo* contextinfo);
   private:
@@ -18711,7 +19054,7 @@ class ButtonsMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_text(ArgT0&& arg0, ArgT... args);
   std::string* mutable_text();
-  PROTOBUF_MUST_USE_RESULT std::string* release_text();
+  PROTOBUF_NODISCARD std::string* release_text();
   void set_allocated_text(std::string* text);
   private:
   const std::string& _internal_text() const;
@@ -18726,7 +19069,7 @@ class ButtonsMessage final :
   public:
   void clear_documentmessage();
   const ::proto::DocumentMessage& documentmessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::DocumentMessage* release_documentmessage();
+  PROTOBUF_NODISCARD ::proto::DocumentMessage* release_documentmessage();
   ::proto::DocumentMessage* mutable_documentmessage();
   void set_allocated_documentmessage(::proto::DocumentMessage* documentmessage);
   private:
@@ -18744,7 +19087,7 @@ class ButtonsMessage final :
   public:
   void clear_imagemessage();
   const ::proto::ImageMessage& imagemessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ImageMessage* release_imagemessage();
+  PROTOBUF_NODISCARD ::proto::ImageMessage* release_imagemessage();
   ::proto::ImageMessage* mutable_imagemessage();
   void set_allocated_imagemessage(::proto::ImageMessage* imagemessage);
   private:
@@ -18762,7 +19105,7 @@ class ButtonsMessage final :
   public:
   void clear_videomessage();
   const ::proto::VideoMessage& videomessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::VideoMessage* release_videomessage();
+  PROTOBUF_NODISCARD ::proto::VideoMessage* release_videomessage();
   ::proto::VideoMessage* mutable_videomessage();
   void set_allocated_videomessage(::proto::VideoMessage* videomessage);
   private:
@@ -18780,7 +19123,7 @@ class ButtonsMessage final :
   public:
   void clear_locationmessage();
   const ::proto::LocationMessage& locationmessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::LocationMessage* release_locationmessage();
+  PROTOBUF_NODISCARD ::proto::LocationMessage* release_locationmessage();
   ::proto::LocationMessage* mutable_locationmessage();
   void set_allocated_locationmessage(::proto::LocationMessage* locationmessage);
   private:
@@ -18808,24 +19151,27 @@ class ButtonsMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::Button > buttons_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr contenttext_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr footertext_;
-  ::proto::ContextInfo* contextinfo_;
-  int headertype_;
-  union HeaderUnion {
-    constexpr HeaderUnion() : _constinit_{} {}
-      ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized _constinit_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr text_;
-    ::proto::DocumentMessage* documentmessage_;
-    ::proto::ImageMessage* imagemessage_;
-    ::proto::VideoMessage* videomessage_;
-    ::proto::LocationMessage* locationmessage_;
-  } header_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 _oneof_case_[1];
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::Button > buttons_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr contenttext_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr footertext_;
+    ::proto::ContextInfo* contextinfo_;
+    int headertype_;
+    union HeaderUnion {
+      constexpr HeaderUnion() : _constinit_{} {}
+        ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized _constinit_;
+      ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr text_;
+      ::proto::DocumentMessage* documentmessage_;
+      ::proto::ImageMessage* imagemessage_;
+      ::proto::VideoMessage* videomessage_;
+      ::proto::LocationMessage* locationmessage_;
+    } header_;
+    uint32_t _oneof_case_[1];
 
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -18835,7 +19181,7 @@ class ButtonsResponseMessage final :
  public:
   inline ButtonsResponseMessage() : ButtonsResponseMessage(nullptr) {}
   ~ButtonsResponseMessage() override;
-  explicit constexpr ButtonsResponseMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR ButtonsResponseMessage(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   ButtonsResponseMessage(const ButtonsResponseMessage& from);
   ButtonsResponseMessage(ButtonsResponseMessage&& from) noexcept
@@ -18897,7 +19243,12 @@ class ButtonsResponseMessage final :
   }
   inline void Swap(ButtonsResponseMessage* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -18911,34 +19262,34 @@ class ButtonsResponseMessage final :
 
   // implements Message ----------------------------------------------
 
-  inline ButtonsResponseMessage* New() const final {
-    return new ButtonsResponseMessage();
-  }
-
-  ButtonsResponseMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  ButtonsResponseMessage* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<ButtonsResponseMessage>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const ButtonsResponseMessage& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const ButtonsResponseMessage& from);
+  void MergeFrom( const ButtonsResponseMessage& from) {
+    ButtonsResponseMessage::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(ButtonsResponseMessage* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.ButtonsResponseMessage";
@@ -18946,9 +19297,6 @@ class ButtonsResponseMessage final :
   protected:
   explicit ButtonsResponseMessage(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -19006,7 +19354,7 @@ class ButtonsResponseMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_selectedbuttonid(ArgT0&& arg0, ArgT... args);
   std::string* mutable_selectedbuttonid();
-  PROTOBUF_MUST_USE_RESULT std::string* release_selectedbuttonid();
+  PROTOBUF_NODISCARD std::string* release_selectedbuttonid();
   void set_allocated_selectedbuttonid(std::string* selectedbuttonid);
   private:
   const std::string& _internal_selectedbuttonid() const;
@@ -19021,7 +19369,7 @@ class ButtonsResponseMessage final :
   public:
   void clear_contextinfo();
   const ::proto::ContextInfo& contextinfo() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ContextInfo* release_contextinfo();
+  PROTOBUF_NODISCARD ::proto::ContextInfo* release_contextinfo();
   ::proto::ContextInfo* mutable_contextinfo();
   void set_allocated_contextinfo(::proto::ContextInfo* contextinfo);
   private:
@@ -19055,7 +19403,7 @@ class ButtonsResponseMessage final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_selecteddisplaytext(ArgT0&& arg0, ArgT... args);
   std::string* mutable_selecteddisplaytext();
-  PROTOBUF_MUST_USE_RESULT std::string* release_selecteddisplaytext();
+  PROTOBUF_NODISCARD std::string* release_selecteddisplaytext();
   void set_allocated_selecteddisplaytext(std::string* selecteddisplaytext);
   private:
   const std::string& _internal_selecteddisplaytext() const;
@@ -19076,18 +19424,21 @@ class ButtonsResponseMessage final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr selectedbuttonid_;
-  ::proto::ContextInfo* contextinfo_;
-  int type_;
-  union ResponseUnion {
-    constexpr ResponseUnion() : _constinit_{} {}
-      ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized _constinit_;
-    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr selecteddisplaytext_;
-  } response_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 _oneof_case_[1];
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr selectedbuttonid_;
+    ::proto::ContextInfo* contextinfo_;
+    int type_;
+    union ResponseUnion {
+      constexpr ResponseUnion() : _constinit_{} {}
+        ::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized _constinit_;
+      ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr selecteddisplaytext_;
+    } response_;
+    uint32_t _oneof_case_[1];
 
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -19097,7 +19448,7 @@ class Message final :
  public:
   inline Message() : Message(nullptr) {}
   ~Message() override;
-  explicit constexpr Message(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR Message(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   Message(const Message& from);
   Message(Message&& from) noexcept
@@ -19154,7 +19505,12 @@ class Message final :
   }
   inline void Swap(Message* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -19168,34 +19524,34 @@ class Message final :
 
   // implements Message ----------------------------------------------
 
-  inline Message* New() const final {
-    return new Message();
-  }
-
-  Message* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  Message* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<Message>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const Message& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const Message& from);
+  void MergeFrom( const Message& from) {
+    Message::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(Message* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.Message";
@@ -19203,9 +19559,6 @@ class Message final :
   protected:
   explicit Message(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -19264,7 +19617,7 @@ class Message final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_conversation(ArgT0&& arg0, ArgT... args);
   std::string* mutable_conversation();
-  PROTOBUF_MUST_USE_RESULT std::string* release_conversation();
+  PROTOBUF_NODISCARD std::string* release_conversation();
   void set_allocated_conversation(std::string* conversation);
   private:
   const std::string& _internal_conversation() const;
@@ -19279,7 +19632,7 @@ class Message final :
   public:
   void clear_senderkeydistributionmessage();
   const ::proto::SenderKeyDistributionMessage& senderkeydistributionmessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::SenderKeyDistributionMessage* release_senderkeydistributionmessage();
+  PROTOBUF_NODISCARD ::proto::SenderKeyDistributionMessage* release_senderkeydistributionmessage();
   ::proto::SenderKeyDistributionMessage* mutable_senderkeydistributionmessage();
   void set_allocated_senderkeydistributionmessage(::proto::SenderKeyDistributionMessage* senderkeydistributionmessage);
   private:
@@ -19297,7 +19650,7 @@ class Message final :
   public:
   void clear_imagemessage();
   const ::proto::ImageMessage& imagemessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ImageMessage* release_imagemessage();
+  PROTOBUF_NODISCARD ::proto::ImageMessage* release_imagemessage();
   ::proto::ImageMessage* mutable_imagemessage();
   void set_allocated_imagemessage(::proto::ImageMessage* imagemessage);
   private:
@@ -19315,7 +19668,7 @@ class Message final :
   public:
   void clear_contactmessage();
   const ::proto::ContactMessage& contactmessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ContactMessage* release_contactmessage();
+  PROTOBUF_NODISCARD ::proto::ContactMessage* release_contactmessage();
   ::proto::ContactMessage* mutable_contactmessage();
   void set_allocated_contactmessage(::proto::ContactMessage* contactmessage);
   private:
@@ -19333,7 +19686,7 @@ class Message final :
   public:
   void clear_locationmessage();
   const ::proto::LocationMessage& locationmessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::LocationMessage* release_locationmessage();
+  PROTOBUF_NODISCARD ::proto::LocationMessage* release_locationmessage();
   ::proto::LocationMessage* mutable_locationmessage();
   void set_allocated_locationmessage(::proto::LocationMessage* locationmessage);
   private:
@@ -19351,7 +19704,7 @@ class Message final :
   public:
   void clear_extendedtextmessage();
   const ::proto::ExtendedTextMessage& extendedtextmessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ExtendedTextMessage* release_extendedtextmessage();
+  PROTOBUF_NODISCARD ::proto::ExtendedTextMessage* release_extendedtextmessage();
   ::proto::ExtendedTextMessage* mutable_extendedtextmessage();
   void set_allocated_extendedtextmessage(::proto::ExtendedTextMessage* extendedtextmessage);
   private:
@@ -19369,7 +19722,7 @@ class Message final :
   public:
   void clear_documentmessage();
   const ::proto::DocumentMessage& documentmessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::DocumentMessage* release_documentmessage();
+  PROTOBUF_NODISCARD ::proto::DocumentMessage* release_documentmessage();
   ::proto::DocumentMessage* mutable_documentmessage();
   void set_allocated_documentmessage(::proto::DocumentMessage* documentmessage);
   private:
@@ -19387,7 +19740,7 @@ class Message final :
   public:
   void clear_audiomessage();
   const ::proto::AudioMessage& audiomessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::AudioMessage* release_audiomessage();
+  PROTOBUF_NODISCARD ::proto::AudioMessage* release_audiomessage();
   ::proto::AudioMessage* mutable_audiomessage();
   void set_allocated_audiomessage(::proto::AudioMessage* audiomessage);
   private:
@@ -19405,7 +19758,7 @@ class Message final :
   public:
   void clear_videomessage();
   const ::proto::VideoMessage& videomessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::VideoMessage* release_videomessage();
+  PROTOBUF_NODISCARD ::proto::VideoMessage* release_videomessage();
   ::proto::VideoMessage* mutable_videomessage();
   void set_allocated_videomessage(::proto::VideoMessage* videomessage);
   private:
@@ -19423,7 +19776,7 @@ class Message final :
   public:
   void clear_call();
   const ::proto::Call& call() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::Call* release_call();
+  PROTOBUF_NODISCARD ::proto::Call* release_call();
   ::proto::Call* mutable_call();
   void set_allocated_call(::proto::Call* call);
   private:
@@ -19441,7 +19794,7 @@ class Message final :
   public:
   void clear_chat();
   const ::proto::Chat& chat() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::Chat* release_chat();
+  PROTOBUF_NODISCARD ::proto::Chat* release_chat();
   ::proto::Chat* mutable_chat();
   void set_allocated_chat(::proto::Chat* chat);
   private:
@@ -19459,7 +19812,7 @@ class Message final :
   public:
   void clear_protocolmessage();
   const ::proto::ProtocolMessage& protocolmessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ProtocolMessage* release_protocolmessage();
+  PROTOBUF_NODISCARD ::proto::ProtocolMessage* release_protocolmessage();
   ::proto::ProtocolMessage* mutable_protocolmessage();
   void set_allocated_protocolmessage(::proto::ProtocolMessage* protocolmessage);
   private:
@@ -19477,7 +19830,7 @@ class Message final :
   public:
   void clear_contactsarraymessage();
   const ::proto::ContactsArrayMessage& contactsarraymessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ContactsArrayMessage* release_contactsarraymessage();
+  PROTOBUF_NODISCARD ::proto::ContactsArrayMessage* release_contactsarraymessage();
   ::proto::ContactsArrayMessage* mutable_contactsarraymessage();
   void set_allocated_contactsarraymessage(::proto::ContactsArrayMessage* contactsarraymessage);
   private:
@@ -19495,7 +19848,7 @@ class Message final :
   public:
   void clear_highlystructuredmessage();
   const ::proto::HighlyStructuredMessage& highlystructuredmessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::HighlyStructuredMessage* release_highlystructuredmessage();
+  PROTOBUF_NODISCARD ::proto::HighlyStructuredMessage* release_highlystructuredmessage();
   ::proto::HighlyStructuredMessage* mutable_highlystructuredmessage();
   void set_allocated_highlystructuredmessage(::proto::HighlyStructuredMessage* highlystructuredmessage);
   private:
@@ -19513,7 +19866,7 @@ class Message final :
   public:
   void clear_fastratchetkeysenderkeydistributionmessage();
   const ::proto::SenderKeyDistributionMessage& fastratchetkeysenderkeydistributionmessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::SenderKeyDistributionMessage* release_fastratchetkeysenderkeydistributionmessage();
+  PROTOBUF_NODISCARD ::proto::SenderKeyDistributionMessage* release_fastratchetkeysenderkeydistributionmessage();
   ::proto::SenderKeyDistributionMessage* mutable_fastratchetkeysenderkeydistributionmessage();
   void set_allocated_fastratchetkeysenderkeydistributionmessage(::proto::SenderKeyDistributionMessage* fastratchetkeysenderkeydistributionmessage);
   private:
@@ -19531,7 +19884,7 @@ class Message final :
   public:
   void clear_sendpaymentmessage();
   const ::proto::SendPaymentMessage& sendpaymentmessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::SendPaymentMessage* release_sendpaymentmessage();
+  PROTOBUF_NODISCARD ::proto::SendPaymentMessage* release_sendpaymentmessage();
   ::proto::SendPaymentMessage* mutable_sendpaymentmessage();
   void set_allocated_sendpaymentmessage(::proto::SendPaymentMessage* sendpaymentmessage);
   private:
@@ -19549,7 +19902,7 @@ class Message final :
   public:
   void clear_livelocationmessage();
   const ::proto::LiveLocationMessage& livelocationmessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::LiveLocationMessage* release_livelocationmessage();
+  PROTOBUF_NODISCARD ::proto::LiveLocationMessage* release_livelocationmessage();
   ::proto::LiveLocationMessage* mutable_livelocationmessage();
   void set_allocated_livelocationmessage(::proto::LiveLocationMessage* livelocationmessage);
   private:
@@ -19567,7 +19920,7 @@ class Message final :
   public:
   void clear_requestpaymentmessage();
   const ::proto::RequestPaymentMessage& requestpaymentmessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::RequestPaymentMessage* release_requestpaymentmessage();
+  PROTOBUF_NODISCARD ::proto::RequestPaymentMessage* release_requestpaymentmessage();
   ::proto::RequestPaymentMessage* mutable_requestpaymentmessage();
   void set_allocated_requestpaymentmessage(::proto::RequestPaymentMessage* requestpaymentmessage);
   private:
@@ -19585,7 +19938,7 @@ class Message final :
   public:
   void clear_declinepaymentrequestmessage();
   const ::proto::DeclinePaymentRequestMessage& declinepaymentrequestmessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::DeclinePaymentRequestMessage* release_declinepaymentrequestmessage();
+  PROTOBUF_NODISCARD ::proto::DeclinePaymentRequestMessage* release_declinepaymentrequestmessage();
   ::proto::DeclinePaymentRequestMessage* mutable_declinepaymentrequestmessage();
   void set_allocated_declinepaymentrequestmessage(::proto::DeclinePaymentRequestMessage* declinepaymentrequestmessage);
   private:
@@ -19603,7 +19956,7 @@ class Message final :
   public:
   void clear_cancelpaymentrequestmessage();
   const ::proto::CancelPaymentRequestMessage& cancelpaymentrequestmessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::CancelPaymentRequestMessage* release_cancelpaymentrequestmessage();
+  PROTOBUF_NODISCARD ::proto::CancelPaymentRequestMessage* release_cancelpaymentrequestmessage();
   ::proto::CancelPaymentRequestMessage* mutable_cancelpaymentrequestmessage();
   void set_allocated_cancelpaymentrequestmessage(::proto::CancelPaymentRequestMessage* cancelpaymentrequestmessage);
   private:
@@ -19621,7 +19974,7 @@ class Message final :
   public:
   void clear_templatemessage();
   const ::proto::TemplateMessage& templatemessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::TemplateMessage* release_templatemessage();
+  PROTOBUF_NODISCARD ::proto::TemplateMessage* release_templatemessage();
   ::proto::TemplateMessage* mutable_templatemessage();
   void set_allocated_templatemessage(::proto::TemplateMessage* templatemessage);
   private:
@@ -19639,7 +19992,7 @@ class Message final :
   public:
   void clear_stickermessage();
   const ::proto::StickerMessage& stickermessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::StickerMessage* release_stickermessage();
+  PROTOBUF_NODISCARD ::proto::StickerMessage* release_stickermessage();
   ::proto::StickerMessage* mutable_stickermessage();
   void set_allocated_stickermessage(::proto::StickerMessage* stickermessage);
   private:
@@ -19657,7 +20010,7 @@ class Message final :
   public:
   void clear_groupinvitemessage();
   const ::proto::GroupInviteMessage& groupinvitemessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::GroupInviteMessage* release_groupinvitemessage();
+  PROTOBUF_NODISCARD ::proto::GroupInviteMessage* release_groupinvitemessage();
   ::proto::GroupInviteMessage* mutable_groupinvitemessage();
   void set_allocated_groupinvitemessage(::proto::GroupInviteMessage* groupinvitemessage);
   private:
@@ -19675,7 +20028,7 @@ class Message final :
   public:
   void clear_templatebuttonreplymessage();
   const ::proto::TemplateButtonReplyMessage& templatebuttonreplymessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::TemplateButtonReplyMessage* release_templatebuttonreplymessage();
+  PROTOBUF_NODISCARD ::proto::TemplateButtonReplyMessage* release_templatebuttonreplymessage();
   ::proto::TemplateButtonReplyMessage* mutable_templatebuttonreplymessage();
   void set_allocated_templatebuttonreplymessage(::proto::TemplateButtonReplyMessage* templatebuttonreplymessage);
   private:
@@ -19693,7 +20046,7 @@ class Message final :
   public:
   void clear_productmessage();
   const ::proto::ProductMessage& productmessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ProductMessage* release_productmessage();
+  PROTOBUF_NODISCARD ::proto::ProductMessage* release_productmessage();
   ::proto::ProductMessage* mutable_productmessage();
   void set_allocated_productmessage(::proto::ProductMessage* productmessage);
   private:
@@ -19711,7 +20064,7 @@ class Message final :
   public:
   void clear_devicesentmessage();
   const ::proto::DeviceSentMessage& devicesentmessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::DeviceSentMessage* release_devicesentmessage();
+  PROTOBUF_NODISCARD ::proto::DeviceSentMessage* release_devicesentmessage();
   ::proto::DeviceSentMessage* mutable_devicesentmessage();
   void set_allocated_devicesentmessage(::proto::DeviceSentMessage* devicesentmessage);
   private:
@@ -19729,7 +20082,7 @@ class Message final :
   public:
   void clear_messagecontextinfo();
   const ::proto::MessageContextInfo& messagecontextinfo() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::MessageContextInfo* release_messagecontextinfo();
+  PROTOBUF_NODISCARD ::proto::MessageContextInfo* release_messagecontextinfo();
   ::proto::MessageContextInfo* mutable_messagecontextinfo();
   void set_allocated_messagecontextinfo(::proto::MessageContextInfo* messagecontextinfo);
   private:
@@ -19747,7 +20100,7 @@ class Message final :
   public:
   void clear_listmessage();
   const ::proto::ListMessage& listmessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ListMessage* release_listmessage();
+  PROTOBUF_NODISCARD ::proto::ListMessage* release_listmessage();
   ::proto::ListMessage* mutable_listmessage();
   void set_allocated_listmessage(::proto::ListMessage* listmessage);
   private:
@@ -19765,7 +20118,7 @@ class Message final :
   public:
   void clear_viewoncemessage();
   const ::proto::FutureProofMessage& viewoncemessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::FutureProofMessage* release_viewoncemessage();
+  PROTOBUF_NODISCARD ::proto::FutureProofMessage* release_viewoncemessage();
   ::proto::FutureProofMessage* mutable_viewoncemessage();
   void set_allocated_viewoncemessage(::proto::FutureProofMessage* viewoncemessage);
   private:
@@ -19783,7 +20136,7 @@ class Message final :
   public:
   void clear_ordermessage();
   const ::proto::OrderMessage& ordermessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::OrderMessage* release_ordermessage();
+  PROTOBUF_NODISCARD ::proto::OrderMessage* release_ordermessage();
   ::proto::OrderMessage* mutable_ordermessage();
   void set_allocated_ordermessage(::proto::OrderMessage* ordermessage);
   private:
@@ -19801,7 +20154,7 @@ class Message final :
   public:
   void clear_listresponsemessage();
   const ::proto::ListResponseMessage& listresponsemessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ListResponseMessage* release_listresponsemessage();
+  PROTOBUF_NODISCARD ::proto::ListResponseMessage* release_listresponsemessage();
   ::proto::ListResponseMessage* mutable_listresponsemessage();
   void set_allocated_listresponsemessage(::proto::ListResponseMessage* listresponsemessage);
   private:
@@ -19819,7 +20172,7 @@ class Message final :
   public:
   void clear_ephemeralmessage();
   const ::proto::FutureProofMessage& ephemeralmessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::FutureProofMessage* release_ephemeralmessage();
+  PROTOBUF_NODISCARD ::proto::FutureProofMessage* release_ephemeralmessage();
   ::proto::FutureProofMessage* mutable_ephemeralmessage();
   void set_allocated_ephemeralmessage(::proto::FutureProofMessage* ephemeralmessage);
   private:
@@ -19837,7 +20190,7 @@ class Message final :
   public:
   void clear_invoicemessage();
   const ::proto::InvoiceMessage& invoicemessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::InvoiceMessage* release_invoicemessage();
+  PROTOBUF_NODISCARD ::proto::InvoiceMessage* release_invoicemessage();
   ::proto::InvoiceMessage* mutable_invoicemessage();
   void set_allocated_invoicemessage(::proto::InvoiceMessage* invoicemessage);
   private:
@@ -19855,7 +20208,7 @@ class Message final :
   public:
   void clear_buttonsmessage();
   const ::proto::ButtonsMessage& buttonsmessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ButtonsMessage* release_buttonsmessage();
+  PROTOBUF_NODISCARD ::proto::ButtonsMessage* release_buttonsmessage();
   ::proto::ButtonsMessage* mutable_buttonsmessage();
   void set_allocated_buttonsmessage(::proto::ButtonsMessage* buttonsmessage);
   private:
@@ -19873,7 +20226,7 @@ class Message final :
   public:
   void clear_buttonsresponsemessage();
   const ::proto::ButtonsResponseMessage& buttonsresponsemessage() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::ButtonsResponseMessage* release_buttonsresponsemessage();
+  PROTOBUF_NODISCARD ::proto::ButtonsResponseMessage* release_buttonsresponsemessage();
   ::proto::ButtonsResponseMessage* mutable_buttonsresponsemessage();
   void set_allocated_buttonsresponsemessage(::proto::ButtonsResponseMessage* buttonsresponsemessage);
   private:
@@ -19891,43 +20244,46 @@ class Message final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<2> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr conversation_;
-  ::proto::SenderKeyDistributionMessage* senderkeydistributionmessage_;
-  ::proto::ImageMessage* imagemessage_;
-  ::proto::ContactMessage* contactmessage_;
-  ::proto::LocationMessage* locationmessage_;
-  ::proto::ExtendedTextMessage* extendedtextmessage_;
-  ::proto::DocumentMessage* documentmessage_;
-  ::proto::AudioMessage* audiomessage_;
-  ::proto::VideoMessage* videomessage_;
-  ::proto::Call* call_;
-  ::proto::Chat* chat_;
-  ::proto::ProtocolMessage* protocolmessage_;
-  ::proto::ContactsArrayMessage* contactsarraymessage_;
-  ::proto::HighlyStructuredMessage* highlystructuredmessage_;
-  ::proto::SenderKeyDistributionMessage* fastratchetkeysenderkeydistributionmessage_;
-  ::proto::SendPaymentMessage* sendpaymentmessage_;
-  ::proto::LiveLocationMessage* livelocationmessage_;
-  ::proto::RequestPaymentMessage* requestpaymentmessage_;
-  ::proto::DeclinePaymentRequestMessage* declinepaymentrequestmessage_;
-  ::proto::CancelPaymentRequestMessage* cancelpaymentrequestmessage_;
-  ::proto::TemplateMessage* templatemessage_;
-  ::proto::StickerMessage* stickermessage_;
-  ::proto::GroupInviteMessage* groupinvitemessage_;
-  ::proto::TemplateButtonReplyMessage* templatebuttonreplymessage_;
-  ::proto::ProductMessage* productmessage_;
-  ::proto::DeviceSentMessage* devicesentmessage_;
-  ::proto::MessageContextInfo* messagecontextinfo_;
-  ::proto::ListMessage* listmessage_;
-  ::proto::FutureProofMessage* viewoncemessage_;
-  ::proto::OrderMessage* ordermessage_;
-  ::proto::ListResponseMessage* listresponsemessage_;
-  ::proto::FutureProofMessage* ephemeralmessage_;
-  ::proto::InvoiceMessage* invoicemessage_;
-  ::proto::ButtonsMessage* buttonsmessage_;
-  ::proto::ButtonsResponseMessage* buttonsresponsemessage_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<2> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr conversation_;
+    ::proto::SenderKeyDistributionMessage* senderkeydistributionmessage_;
+    ::proto::ImageMessage* imagemessage_;
+    ::proto::ContactMessage* contactmessage_;
+    ::proto::LocationMessage* locationmessage_;
+    ::proto::ExtendedTextMessage* extendedtextmessage_;
+    ::proto::DocumentMessage* documentmessage_;
+    ::proto::AudioMessage* audiomessage_;
+    ::proto::VideoMessage* videomessage_;
+    ::proto::Call* call_;
+    ::proto::Chat* chat_;
+    ::proto::ProtocolMessage* protocolmessage_;
+    ::proto::ContactsArrayMessage* contactsarraymessage_;
+    ::proto::HighlyStructuredMessage* highlystructuredmessage_;
+    ::proto::SenderKeyDistributionMessage* fastratchetkeysenderkeydistributionmessage_;
+    ::proto::SendPaymentMessage* sendpaymentmessage_;
+    ::proto::LiveLocationMessage* livelocationmessage_;
+    ::proto::RequestPaymentMessage* requestpaymentmessage_;
+    ::proto::DeclinePaymentRequestMessage* declinepaymentrequestmessage_;
+    ::proto::CancelPaymentRequestMessage* cancelpaymentrequestmessage_;
+    ::proto::TemplateMessage* templatemessage_;
+    ::proto::StickerMessage* stickermessage_;
+    ::proto::GroupInviteMessage* groupinvitemessage_;
+    ::proto::TemplateButtonReplyMessage* templatebuttonreplymessage_;
+    ::proto::ProductMessage* productmessage_;
+    ::proto::DeviceSentMessage* devicesentmessage_;
+    ::proto::MessageContextInfo* messagecontextinfo_;
+    ::proto::ListMessage* listmessage_;
+    ::proto::FutureProofMessage* viewoncemessage_;
+    ::proto::OrderMessage* ordermessage_;
+    ::proto::ListResponseMessage* listresponsemessage_;
+    ::proto::FutureProofMessage* ephemeralmessage_;
+    ::proto::InvoiceMessage* invoicemessage_;
+    ::proto::ButtonsMessage* buttonsmessage_;
+    ::proto::ButtonsResponseMessage* buttonsresponsemessage_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -19937,7 +20293,7 @@ class MessageKey final :
  public:
   inline MessageKey() : MessageKey(nullptr) {}
   ~MessageKey() override;
-  explicit constexpr MessageKey(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR MessageKey(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   MessageKey(const MessageKey& from);
   MessageKey(MessageKey&& from) noexcept
@@ -19994,7 +20350,12 @@ class MessageKey final :
   }
   inline void Swap(MessageKey* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -20008,34 +20369,34 @@ class MessageKey final :
 
   // implements Message ----------------------------------------------
 
-  inline MessageKey* New() const final {
-    return new MessageKey();
-  }
-
-  MessageKey* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  MessageKey* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<MessageKey>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const MessageKey& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const MessageKey& from);
+  void MergeFrom( const MessageKey& from) {
+    MessageKey::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(MessageKey* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.MessageKey";
@@ -20043,9 +20404,6 @@ class MessageKey final :
   protected:
   explicit MessageKey(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -20073,7 +20431,7 @@ class MessageKey final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_remotejid(ArgT0&& arg0, ArgT... args);
   std::string* mutable_remotejid();
-  PROTOBUF_MUST_USE_RESULT std::string* release_remotejid();
+  PROTOBUF_NODISCARD std::string* release_remotejid();
   void set_allocated_remotejid(std::string* remotejid);
   private:
   const std::string& _internal_remotejid() const;
@@ -20091,7 +20449,7 @@ class MessageKey final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_id(ArgT0&& arg0, ArgT... args);
   std::string* mutable_id();
-  PROTOBUF_MUST_USE_RESULT std::string* release_id();
+  PROTOBUF_NODISCARD std::string* release_id();
   void set_allocated_id(std::string* id);
   private:
   const std::string& _internal_id() const;
@@ -20109,7 +20467,7 @@ class MessageKey final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_participant(ArgT0&& arg0, ArgT... args);
   std::string* mutable_participant();
-  PROTOBUF_MUST_USE_RESULT std::string* release_participant();
+  PROTOBUF_NODISCARD std::string* release_participant();
   void set_allocated_participant(std::string* participant);
   private:
   const std::string& _internal_participant() const;
@@ -20137,12 +20495,15 @@ class MessageKey final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr remotejid_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr id_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr participant_;
-  bool fromme_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr remotejid_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr id_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr participant_;
+    bool fromme_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -20152,7 +20513,7 @@ class WebFeatures final :
  public:
   inline WebFeatures() : WebFeatures(nullptr) {}
   ~WebFeatures() override;
-  explicit constexpr WebFeatures(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR WebFeatures(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   WebFeatures(const WebFeatures& from);
   WebFeatures(WebFeatures&& from) noexcept
@@ -20209,7 +20570,12 @@ class WebFeatures final :
   }
   inline void Swap(WebFeatures* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -20223,34 +20589,34 @@ class WebFeatures final :
 
   // implements Message ----------------------------------------------
 
-  inline WebFeatures* New() const final {
-    return new WebFeatures();
-  }
-
-  WebFeatures* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  WebFeatures* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<WebFeatures>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const WebFeatures& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const WebFeatures& from);
+  void MergeFrom( const WebFeatures& from) {
+    WebFeatures::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(WebFeatures* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.WebFeatures";
@@ -20258,9 +20624,6 @@ class WebFeatures final :
   protected:
   explicit WebFeatures(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -20875,48 +21238,51 @@ class WebFeatures final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<2> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  int labelsdisplay_;
-  int voipindividualoutgoing_;
-  int groupsv3_;
-  int groupsv3create_;
-  int changenumberv2_;
-  int querystatusv3thumbnail_;
-  int livelocations_;
-  int queryvname_;
-  int voipindividualincoming_;
-  int quickrepliesquery_;
-  int payments_;
-  int stickerpackquery_;
-  int livelocationsfinal_;
-  int labelsedit_;
-  int mediaupload_;
-  int mediauploadrichquickreplies_;
-  int vnamev2_;
-  int videoplaybackurl_;
-  int statusranking_;
-  int voipindividualvideo_;
-  int thirdpartystickers_;
-  int frequentlyforwardedsetting_;
-  int groupsv4joinpermission_;
-  int recentstickers_;
-  int catalog_;
-  int starredstickers_;
-  int voipgroupcall_;
-  int templatemessage_;
-  int templatemessageinteractivity_;
-  int ephemeralmessages_;
-  int e2enotificationsync_;
-  int recentstickersv2_;
-  int syncdrelease1_;
-  int recentstickersv3_;
-  int usernotice_;
-  int syncdrelease11_;
-  int support_;
-  int groupuiicleanup_;
-  int groupdogfoodinginternalonly_;
-  int settingssync_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<2> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    int labelsdisplay_;
+    int voipindividualoutgoing_;
+    int groupsv3_;
+    int groupsv3create_;
+    int changenumberv2_;
+    int querystatusv3thumbnail_;
+    int livelocations_;
+    int queryvname_;
+    int voipindividualincoming_;
+    int quickrepliesquery_;
+    int payments_;
+    int stickerpackquery_;
+    int livelocationsfinal_;
+    int labelsedit_;
+    int mediaupload_;
+    int mediauploadrichquickreplies_;
+    int vnamev2_;
+    int videoplaybackurl_;
+    int statusranking_;
+    int voipindividualvideo_;
+    int thirdpartystickers_;
+    int frequentlyforwardedsetting_;
+    int groupsv4joinpermission_;
+    int recentstickers_;
+    int catalog_;
+    int starredstickers_;
+    int voipgroupcall_;
+    int templatemessage_;
+    int templatemessageinteractivity_;
+    int ephemeralmessages_;
+    int e2enotificationsync_;
+    int recentstickersv2_;
+    int syncdrelease1_;
+    int recentstickersv3_;
+    int usernotice_;
+    int syncdrelease11_;
+    int support_;
+    int groupuiicleanup_;
+    int groupdogfoodinginternalonly_;
+    int settingssync_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -20926,7 +21292,7 @@ class NotificationMessageInfo final :
  public:
   inline NotificationMessageInfo() : NotificationMessageInfo(nullptr) {}
   ~NotificationMessageInfo() override;
-  explicit constexpr NotificationMessageInfo(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR NotificationMessageInfo(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   NotificationMessageInfo(const NotificationMessageInfo& from);
   NotificationMessageInfo(NotificationMessageInfo&& from) noexcept
@@ -20983,7 +21349,12 @@ class NotificationMessageInfo final :
   }
   inline void Swap(NotificationMessageInfo* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -20997,34 +21368,34 @@ class NotificationMessageInfo final :
 
   // implements Message ----------------------------------------------
 
-  inline NotificationMessageInfo* New() const final {
-    return new NotificationMessageInfo();
-  }
-
-  NotificationMessageInfo* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  NotificationMessageInfo* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<NotificationMessageInfo>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const NotificationMessageInfo& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const NotificationMessageInfo& from);
+  void MergeFrom( const NotificationMessageInfo& from) {
+    NotificationMessageInfo::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(NotificationMessageInfo* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.NotificationMessageInfo";
@@ -21032,9 +21403,6 @@ class NotificationMessageInfo final :
   protected:
   explicit NotificationMessageInfo(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -21062,7 +21430,7 @@ class NotificationMessageInfo final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_participant(ArgT0&& arg0, ArgT... args);
   std::string* mutable_participant();
-  PROTOBUF_MUST_USE_RESULT std::string* release_participant();
+  PROTOBUF_NODISCARD std::string* release_participant();
   void set_allocated_participant(std::string* participant);
   private:
   const std::string& _internal_participant() const;
@@ -21077,7 +21445,7 @@ class NotificationMessageInfo final :
   public:
   void clear_key();
   const ::proto::MessageKey& key() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::MessageKey* release_key();
+  PROTOBUF_NODISCARD ::proto::MessageKey* release_key();
   ::proto::MessageKey* mutable_key();
   void set_allocated_key(::proto::MessageKey* key);
   private:
@@ -21095,7 +21463,7 @@ class NotificationMessageInfo final :
   public:
   void clear_message();
   const ::proto::Message& message() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::Message* release_message();
+  PROTOBUF_NODISCARD ::proto::Message* release_message();
   ::proto::Message* mutable_message();
   void set_allocated_message(::proto::Message* message);
   private:
@@ -21112,11 +21480,11 @@ class NotificationMessageInfo final :
   bool _internal_has_messagetimestamp() const;
   public:
   void clear_messagetimestamp();
-  ::PROTOBUF_NAMESPACE_ID::uint64 messagetimestamp() const;
-  void set_messagetimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t messagetimestamp() const;
+  void set_messagetimestamp(uint64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint64 _internal_messagetimestamp() const;
-  void _internal_set_messagetimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t _internal_messagetimestamp() const;
+  void _internal_set_messagetimestamp(uint64_t value);
   public:
 
   // @@protoc_insertion_point(class_scope:proto.NotificationMessageInfo)
@@ -21126,12 +21494,15 @@ class NotificationMessageInfo final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr participant_;
-  ::proto::MessageKey* key_;
-  ::proto::Message* message_;
-  ::PROTOBUF_NAMESPACE_ID::uint64 messagetimestamp_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr participant_;
+    ::proto::MessageKey* key_;
+    ::proto::Message* message_;
+    uint64_t messagetimestamp_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -21141,7 +21512,7 @@ class WebNotificationsInfo final :
  public:
   inline WebNotificationsInfo() : WebNotificationsInfo(nullptr) {}
   ~WebNotificationsInfo() override;
-  explicit constexpr WebNotificationsInfo(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR WebNotificationsInfo(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   WebNotificationsInfo(const WebNotificationsInfo& from);
   WebNotificationsInfo(WebNotificationsInfo&& from) noexcept
@@ -21198,7 +21569,12 @@ class WebNotificationsInfo final :
   }
   inline void Swap(WebNotificationsInfo* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -21212,34 +21588,34 @@ class WebNotificationsInfo final :
 
   // implements Message ----------------------------------------------
 
-  inline WebNotificationsInfo* New() const final {
-    return new WebNotificationsInfo();
-  }
-
-  WebNotificationsInfo* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  WebNotificationsInfo* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<WebNotificationsInfo>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const WebNotificationsInfo& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const WebNotificationsInfo& from);
+  void MergeFrom( const WebNotificationsInfo& from) {
+    WebNotificationsInfo::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(WebNotificationsInfo* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.WebNotificationsInfo";
@@ -21247,9 +21623,6 @@ class WebNotificationsInfo final :
   protected:
   explicit WebNotificationsInfo(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -21291,11 +21664,11 @@ class WebNotificationsInfo final :
   bool _internal_has_timestamp() const;
   public:
   void clear_timestamp();
-  ::PROTOBUF_NAMESPACE_ID::uint64 timestamp() const;
-  void set_timestamp(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t timestamp() const;
+  void set_timestamp(uint64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint64 _internal_timestamp() const;
-  void _internal_set_timestamp(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t _internal_timestamp() const;
+  void _internal_set_timestamp(uint64_t value);
   public:
 
   // optional uint32 unreadChats = 3;
@@ -21304,11 +21677,11 @@ class WebNotificationsInfo final :
   bool _internal_has_unreadchats() const;
   public:
   void clear_unreadchats();
-  ::PROTOBUF_NAMESPACE_ID::uint32 unreadchats() const;
-  void set_unreadchats(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t unreadchats() const;
+  void set_unreadchats(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_unreadchats() const;
-  void _internal_set_unreadchats(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_unreadchats() const;
+  void _internal_set_unreadchats(uint32_t value);
   public:
 
   // optional uint32 notifyMessageCount = 4;
@@ -21317,11 +21690,11 @@ class WebNotificationsInfo final :
   bool _internal_has_notifymessagecount() const;
   public:
   void clear_notifymessagecount();
-  ::PROTOBUF_NAMESPACE_ID::uint32 notifymessagecount() const;
-  void set_notifymessagecount(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t notifymessagecount() const;
+  void set_notifymessagecount(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_notifymessagecount() const;
-  void _internal_set_notifymessagecount(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_notifymessagecount() const;
+  void _internal_set_notifymessagecount(uint32_t value);
   public:
 
   // @@protoc_insertion_point(class_scope:proto.WebNotificationsInfo)
@@ -21331,12 +21704,15 @@ class WebNotificationsInfo final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::WebMessageInfo > notifymessages_;
-  ::PROTOBUF_NAMESPACE_ID::uint64 timestamp_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 unreadchats_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 notifymessagecount_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::WebMessageInfo > notifymessages_;
+    uint64_t timestamp_;
+    uint32_t unreadchats_;
+    uint32_t notifymessagecount_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -21346,7 +21722,7 @@ class PaymentInfo final :
  public:
   inline PaymentInfo() : PaymentInfo(nullptr) {}
   ~PaymentInfo() override;
-  explicit constexpr PaymentInfo(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR PaymentInfo(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   PaymentInfo(const PaymentInfo& from);
   PaymentInfo(PaymentInfo&& from) noexcept
@@ -21403,7 +21779,12 @@ class PaymentInfo final :
   }
   inline void Swap(PaymentInfo* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -21417,34 +21798,34 @@ class PaymentInfo final :
 
   // implements Message ----------------------------------------------
 
-  inline PaymentInfo* New() const final {
-    return new PaymentInfo();
-  }
-
-  PaymentInfo* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  PaymentInfo* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<PaymentInfo>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const PaymentInfo& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const PaymentInfo& from);
+  void MergeFrom( const PaymentInfo& from) {
+    PaymentInfo::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(PaymentInfo* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.PaymentInfo";
@@ -21452,9 +21833,6 @@ class PaymentInfo final :
   protected:
   explicit PaymentInfo(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -21653,7 +22031,7 @@ class PaymentInfo final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_receiverjid(ArgT0&& arg0, ArgT... args);
   std::string* mutable_receiverjid();
-  PROTOBUF_MUST_USE_RESULT std::string* release_receiverjid();
+  PROTOBUF_NODISCARD std::string* release_receiverjid();
   void set_allocated_receiverjid(std::string* receiverjid);
   private:
   const std::string& _internal_receiverjid() const;
@@ -21671,7 +22049,7 @@ class PaymentInfo final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_currency(ArgT0&& arg0, ArgT... args);
   std::string* mutable_currency();
-  PROTOBUF_MUST_USE_RESULT std::string* release_currency();
+  PROTOBUF_NODISCARD std::string* release_currency();
   void set_allocated_currency(std::string* currency);
   private:
   const std::string& _internal_currency() const;
@@ -21686,7 +22064,7 @@ class PaymentInfo final :
   public:
   void clear_requestmessagekey();
   const ::proto::MessageKey& requestmessagekey() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::MessageKey* release_requestmessagekey();
+  PROTOBUF_NODISCARD ::proto::MessageKey* release_requestmessagekey();
   ::proto::MessageKey* mutable_requestmessagekey();
   void set_allocated_requestmessagekey(::proto::MessageKey* requestmessagekey);
   private:
@@ -21704,7 +22082,7 @@ class PaymentInfo final :
   public:
   void clear_primaryamount();
   const ::proto::PaymentMoney& primaryamount() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::PaymentMoney* release_primaryamount();
+  PROTOBUF_NODISCARD ::proto::PaymentMoney* release_primaryamount();
   ::proto::PaymentMoney* mutable_primaryamount();
   void set_allocated_primaryamount(::proto::PaymentMoney* primaryamount);
   private:
@@ -21722,7 +22100,7 @@ class PaymentInfo final :
   public:
   void clear_exchangeamount();
   const ::proto::PaymentMoney& exchangeamount() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::PaymentMoney* release_exchangeamount();
+  PROTOBUF_NODISCARD ::proto::PaymentMoney* release_exchangeamount();
   ::proto::PaymentMoney* mutable_exchangeamount();
   void set_allocated_exchangeamount(::proto::PaymentMoney* exchangeamount);
   private:
@@ -21739,11 +22117,11 @@ class PaymentInfo final :
   bool _internal_has_amount1000() const;
   public:
   void clear_amount1000();
-  ::PROTOBUF_NAMESPACE_ID::uint64 amount1000() const;
-  void set_amount1000(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t amount1000() const;
+  void set_amount1000(uint64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint64 _internal_amount1000() const;
-  void _internal_set_amount1000(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t _internal_amount1000() const;
+  void _internal_set_amount1000(uint64_t value);
   public:
 
   // optional .proto.PaymentInfo.PaymentInfoCurrency currencyDeprecated = 1;
@@ -21778,11 +22156,11 @@ class PaymentInfo final :
   bool _internal_has_transactiontimestamp() const;
   public:
   void clear_transactiontimestamp();
-  ::PROTOBUF_NAMESPACE_ID::uint64 transactiontimestamp() const;
-  void set_transactiontimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t transactiontimestamp() const;
+  void set_transactiontimestamp(uint64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint64 _internal_transactiontimestamp() const;
-  void _internal_set_transactiontimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t _internal_transactiontimestamp() const;
+  void _internal_set_transactiontimestamp(uint64_t value);
   public:
 
   // optional uint64 expiryTimestamp = 7;
@@ -21791,11 +22169,11 @@ class PaymentInfo final :
   bool _internal_has_expirytimestamp() const;
   public:
   void clear_expirytimestamp();
-  ::PROTOBUF_NAMESPACE_ID::uint64 expirytimestamp() const;
-  void set_expirytimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t expirytimestamp() const;
+  void set_expirytimestamp(uint64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint64 _internal_expirytimestamp() const;
-  void _internal_set_expirytimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t _internal_expirytimestamp() const;
+  void _internal_set_expirytimestamp(uint64_t value);
   public:
 
   // optional bool futureproofed = 8;
@@ -21844,21 +22222,24 @@ class PaymentInfo final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr receiverjid_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr currency_;
-  ::proto::MessageKey* requestmessagekey_;
-  ::proto::PaymentMoney* primaryamount_;
-  ::proto::PaymentMoney* exchangeamount_;
-  ::PROTOBUF_NAMESPACE_ID::uint64 amount1000_;
-  int currencydeprecated_;
-  int status_;
-  ::PROTOBUF_NAMESPACE_ID::uint64 transactiontimestamp_;
-  ::PROTOBUF_NAMESPACE_ID::uint64 expirytimestamp_;
-  bool futureproofed_;
-  bool usenovifiatformat_;
-  int txnstatus_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr receiverjid_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr currency_;
+    ::proto::MessageKey* requestmessagekey_;
+    ::proto::PaymentMoney* primaryamount_;
+    ::proto::PaymentMoney* exchangeamount_;
+    uint64_t amount1000_;
+    int currencydeprecated_;
+    int status_;
+    uint64_t transactiontimestamp_;
+    uint64_t expirytimestamp_;
+    bool futureproofed_;
+    bool usenovifiatformat_;
+    int txnstatus_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // -------------------------------------------------------------------
@@ -21868,7 +22249,7 @@ class WebMessageInfo final :
  public:
   inline WebMessageInfo() : WebMessageInfo(nullptr) {}
   ~WebMessageInfo() override;
-  explicit constexpr WebMessageInfo(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
+  explicit PROTOBUF_CONSTEXPR WebMessageInfo(::PROTOBUF_NAMESPACE_ID::internal::ConstantInitialized);
 
   WebMessageInfo(const WebMessageInfo& from);
   WebMessageInfo(WebMessageInfo&& from) noexcept
@@ -21925,7 +22306,12 @@ class WebMessageInfo final :
   }
   inline void Swap(WebMessageInfo* 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 {
       ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
@@ -21939,34 +22325,34 @@ class WebMessageInfo final :
 
   // implements Message ----------------------------------------------
 
-  inline WebMessageInfo* New() const final {
-    return new WebMessageInfo();
-  }
-
-  WebMessageInfo* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+  WebMessageInfo* New(::PROTOBUF_NAMESPACE_ID::Arena* arena = nullptr) const final {
     return CreateMaybeMessage<WebMessageInfo>(arena);
   }
   using ::PROTOBUF_NAMESPACE_ID::Message::CopyFrom;
   void CopyFrom(const WebMessageInfo& from);
   using ::PROTOBUF_NAMESPACE_ID::Message::MergeFrom;
-  void MergeFrom(const WebMessageInfo& from);
+  void MergeFrom( const WebMessageInfo& from) {
+    WebMessageInfo::MergeImpl(*this, from);
+  }
   private:
-  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message* to, const ::PROTOBUF_NAMESPACE_ID::Message& from);
+  static void MergeImpl(::PROTOBUF_NAMESPACE_ID::Message& to_msg, const ::PROTOBUF_NAMESPACE_ID::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, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
-  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
-      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
-  int GetCachedSize() const final { return _cached_size_.Get(); }
+  uint8_t* _InternalSerialize(
+      uint8_t* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _impl_._cached_size_.Get(); }
 
   private:
-  void SharedCtor();
+  void SharedCtor(::PROTOBUF_NAMESPACE_ID::Arena* arena, bool is_message_owned);
   void SharedDtor();
   void SetCachedSize(int size) const final;
   void InternalSwap(WebMessageInfo* other);
+
+  private:
   friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
   static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
     return "proto.WebMessageInfo";
@@ -21974,9 +22360,6 @@ class WebMessageInfo final :
   protected:
   explicit WebMessageInfo(::PROTOBUF_NAMESPACE_ID::Arena* arena,
                        bool is_message_owned = false);
-  private:
-  static void ArenaDtor(void* object);
-  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
   public:
 
   static const ClassData _class_data_;
@@ -22411,7 +22794,7 @@ class WebMessageInfo final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_participant(ArgT0&& arg0, ArgT... args);
   std::string* mutable_participant();
-  PROTOBUF_MUST_USE_RESULT std::string* release_participant();
+  PROTOBUF_NODISCARD std::string* release_participant();
   void set_allocated_participant(std::string* participant);
   private:
   const std::string& _internal_participant() const;
@@ -22429,7 +22812,7 @@ class WebMessageInfo final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_pushname(ArgT0&& arg0, ArgT... args);
   std::string* mutable_pushname();
-  PROTOBUF_MUST_USE_RESULT std::string* release_pushname();
+  PROTOBUF_NODISCARD std::string* release_pushname();
   void set_allocated_pushname(std::string* pushname);
   private:
   const std::string& _internal_pushname() const;
@@ -22447,7 +22830,7 @@ class WebMessageInfo final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_mediaciphertextsha256(ArgT0&& arg0, ArgT... args);
   std::string* mutable_mediaciphertextsha256();
-  PROTOBUF_MUST_USE_RESULT std::string* release_mediaciphertextsha256();
+  PROTOBUF_NODISCARD std::string* release_mediaciphertextsha256();
   void set_allocated_mediaciphertextsha256(std::string* mediaciphertextsha256);
   private:
   const std::string& _internal_mediaciphertextsha256() const;
@@ -22465,7 +22848,7 @@ class WebMessageInfo final :
   template <typename ArgT0 = const std::string&, typename... ArgT>
   void set_verifiedbizname(ArgT0&& arg0, ArgT... args);
   std::string* mutable_verifiedbizname();
-  PROTOBUF_MUST_USE_RESULT std::string* release_verifiedbizname();
+  PROTOBUF_NODISCARD std::string* release_verifiedbizname();
   void set_allocated_verifiedbizname(std::string* verifiedbizname);
   private:
   const std::string& _internal_verifiedbizname() const;
@@ -22480,7 +22863,7 @@ class WebMessageInfo final :
   public:
   void clear_key();
   const ::proto::MessageKey& key() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::MessageKey* release_key();
+  PROTOBUF_NODISCARD ::proto::MessageKey* release_key();
   ::proto::MessageKey* mutable_key();
   void set_allocated_key(::proto::MessageKey* key);
   private:
@@ -22498,7 +22881,7 @@ class WebMessageInfo final :
   public:
   void clear_message();
   const ::proto::Message& message() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::Message* release_message();
+  PROTOBUF_NODISCARD ::proto::Message* release_message();
   ::proto::Message* mutable_message();
   void set_allocated_message(::proto::Message* message);
   private:
@@ -22516,7 +22899,7 @@ class WebMessageInfo final :
   public:
   void clear_paymentinfo();
   const ::proto::PaymentInfo& paymentinfo() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::PaymentInfo* release_paymentinfo();
+  PROTOBUF_NODISCARD ::proto::PaymentInfo* release_paymentinfo();
   ::proto::PaymentInfo* mutable_paymentinfo();
   void set_allocated_paymentinfo(::proto::PaymentInfo* paymentinfo);
   private:
@@ -22534,7 +22917,7 @@ class WebMessageInfo final :
   public:
   void clear_finallivelocation();
   const ::proto::LiveLocationMessage& finallivelocation() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::LiveLocationMessage* release_finallivelocation();
+  PROTOBUF_NODISCARD ::proto::LiveLocationMessage* release_finallivelocation();
   ::proto::LiveLocationMessage* mutable_finallivelocation();
   void set_allocated_finallivelocation(::proto::LiveLocationMessage* finallivelocation);
   private:
@@ -22552,7 +22935,7 @@ class WebMessageInfo final :
   public:
   void clear_quotedpaymentinfo();
   const ::proto::PaymentInfo& quotedpaymentinfo() const;
-  PROTOBUF_MUST_USE_RESULT ::proto::PaymentInfo* release_quotedpaymentinfo();
+  PROTOBUF_NODISCARD ::proto::PaymentInfo* release_quotedpaymentinfo();
   ::proto::PaymentInfo* mutable_quotedpaymentinfo();
   void set_allocated_quotedpaymentinfo(::proto::PaymentInfo* quotedpaymentinfo);
   private:
@@ -22569,11 +22952,11 @@ class WebMessageInfo final :
   bool _internal_has_messagetimestamp() const;
   public:
   void clear_messagetimestamp();
-  ::PROTOBUF_NAMESPACE_ID::uint64 messagetimestamp() const;
-  void set_messagetimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t messagetimestamp() const;
+  void set_messagetimestamp(uint64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint64 _internal_messagetimestamp() const;
-  void _internal_set_messagetimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t _internal_messagetimestamp() const;
+  void _internal_set_messagetimestamp(uint64_t value);
   public:
 
   // optional .proto.WebMessageInfo.WebMessageInfoStatus status = 4;
@@ -22712,11 +23095,11 @@ class WebMessageInfo final :
   bool _internal_has_duration() const;
   public:
   void clear_duration();
-  ::PROTOBUF_NAMESPACE_ID::uint32 duration() const;
-  void set_duration(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t duration() const;
+  void set_duration(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_duration() const;
-  void _internal_set_duration(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_duration() const;
+  void _internal_set_duration(uint32_t value);
   public:
 
   // optional uint32 ephemeralDuration = 33;
@@ -22725,11 +23108,11 @@ class WebMessageInfo final :
   bool _internal_has_ephemeralduration() const;
   public:
   void clear_ephemeralduration();
-  ::PROTOBUF_NAMESPACE_ID::uint32 ephemeralduration() const;
-  void set_ephemeralduration(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t ephemeralduration() const;
+  void set_ephemeralduration(uint32_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint32 _internal_ephemeralduration() const;
-  void _internal_set_ephemeralduration(::PROTOBUF_NAMESPACE_ID::uint32 value);
+  uint32_t _internal_ephemeralduration() const;
+  void _internal_set_ephemeralduration(uint32_t value);
   public:
 
   // optional uint64 ephemeralStartTimestamp = 32;
@@ -22738,11 +23121,11 @@ class WebMessageInfo final :
   bool _internal_has_ephemeralstarttimestamp() const;
   public:
   void clear_ephemeralstarttimestamp();
-  ::PROTOBUF_NAMESPACE_ID::uint64 ephemeralstarttimestamp() const;
-  void set_ephemeralstarttimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t ephemeralstarttimestamp() const;
+  void set_ephemeralstarttimestamp(uint64_t value);
   private:
-  ::PROTOBUF_NAMESPACE_ID::uint64 _internal_ephemeralstarttimestamp() const;
-  void _internal_set_ephemeralstarttimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value);
+  uint64_t _internal_ephemeralstarttimestamp() const;
+  void _internal_set_ephemeralstarttimestamp(uint64_t value);
   public:
 
   // optional bool ephemeralOutOfSync = 35;
@@ -22778,35 +23161,38 @@ class WebMessageInfo final :
   template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
   typedef void InternalArenaConstructable_;
   typedef void DestructorSkippable_;
-  ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
-  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> messagestubparameters_;
-  ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> labels_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr participant_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr pushname_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr mediaciphertextsha256_;
-  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr verifiedbizname_;
-  ::proto::MessageKey* key_;
-  ::proto::Message* message_;
-  ::proto::PaymentInfo* paymentinfo_;
-  ::proto::LiveLocationMessage* finallivelocation_;
-  ::proto::PaymentInfo* quotedpaymentinfo_;
-  ::PROTOBUF_NAMESPACE_ID::uint64 messagetimestamp_;
-  int status_;
-  bool ignore_;
-  bool starred_;
-  bool broadcast_;
-  bool multicast_;
-  int messagestubtype_;
-  bool urltext_;
-  bool urlnumber_;
-  bool clearmedia_;
-  bool ephemeralofftoon_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 duration_;
-  ::PROTOBUF_NAMESPACE_ID::uint32 ephemeralduration_;
-  ::PROTOBUF_NAMESPACE_ID::uint64 ephemeralstarttimestamp_;
-  bool ephemeraloutofsync_;
-  int bizprivacystatus_;
+  struct Impl_ {
+    ::PROTOBUF_NAMESPACE_ID::internal::HasBits<1> _has_bits_;
+    mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> messagestubparameters_;
+    ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string> labels_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr participant_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr pushname_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr mediaciphertextsha256_;
+    ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr verifiedbizname_;
+    ::proto::MessageKey* key_;
+    ::proto::Message* message_;
+    ::proto::PaymentInfo* paymentinfo_;
+    ::proto::LiveLocationMessage* finallivelocation_;
+    ::proto::PaymentInfo* quotedpaymentinfo_;
+    uint64_t messagetimestamp_;
+    int status_;
+    bool ignore_;
+    bool starred_;
+    bool broadcast_;
+    bool multicast_;
+    int messagestubtype_;
+    bool urltext_;
+    bool urlnumber_;
+    bool clearmedia_;
+    bool ephemeralofftoon_;
+    uint32_t duration_;
+    uint32_t ephemeralduration_;
+    uint64_t ephemeralstarttimestamp_;
+    bool ephemeraloutofsync_;
+    int bizprivacystatus_;
+  };
+  union { Impl_ _impl_; };
   friend struct ::TableStruct_pmsg_2eproto;
 };
 // ===================================================================
@@ -22822,71 +23208,71 @@ class WebMessageInfo final :
 
 // optional int64 value = 1;
 inline bool PaymentMoney::_internal_has_value() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool PaymentMoney::has_value() const {
   return _internal_has_value();
 }
 inline void PaymentMoney::clear_value() {
-  value_ = int64_t{0};
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.value_ = int64_t{0};
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 PaymentMoney::_internal_value() const {
-  return value_;
+inline int64_t PaymentMoney::_internal_value() const {
+  return _impl_.value_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 PaymentMoney::value() const {
+inline int64_t PaymentMoney::value() const {
   // @@protoc_insertion_point(field_get:proto.PaymentMoney.value)
   return _internal_value();
 }
-inline void PaymentMoney::_internal_set_value(::PROTOBUF_NAMESPACE_ID::int64 value) {
-  _has_bits_[0] |= 0x00000002u;
-  value_ = value;
+inline void PaymentMoney::_internal_set_value(int64_t value) {
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.value_ = value;
 }
-inline void PaymentMoney::set_value(::PROTOBUF_NAMESPACE_ID::int64 value) {
+inline void PaymentMoney::set_value(int64_t value) {
   _internal_set_value(value);
   // @@protoc_insertion_point(field_set:proto.PaymentMoney.value)
 }
 
 // optional uint32 offset = 2;
 inline bool PaymentMoney::_internal_has_offset() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool PaymentMoney::has_offset() const {
   return _internal_has_offset();
 }
 inline void PaymentMoney::clear_offset() {
-  offset_ = 0u;
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.offset_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 PaymentMoney::_internal_offset() const {
-  return offset_;
+inline uint32_t PaymentMoney::_internal_offset() const {
+  return _impl_.offset_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 PaymentMoney::offset() const {
+inline uint32_t PaymentMoney::offset() const {
   // @@protoc_insertion_point(field_get:proto.PaymentMoney.offset)
   return _internal_offset();
 }
-inline void PaymentMoney::_internal_set_offset(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000004u;
-  offset_ = value;
+inline void PaymentMoney::_internal_set_offset(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.offset_ = value;
 }
-inline void PaymentMoney::set_offset(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void PaymentMoney::set_offset(uint32_t value) {
   _internal_set_offset(value);
   // @@protoc_insertion_point(field_set:proto.PaymentMoney.offset)
 }
 
 // optional string currencyCode = 3;
 inline bool PaymentMoney::_internal_has_currencycode() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool PaymentMoney::has_currencycode() const {
   return _internal_has_currencycode();
 }
 inline void PaymentMoney::clear_currencycode() {
-  currencycode_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.currencycode_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& PaymentMoney::currencycode() const {
   // @@protoc_insertion_point(field_get:proto.PaymentMoney.currencyCode)
@@ -22895,8 +23281,8 @@ inline const std::string& PaymentMoney::currencycode() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void PaymentMoney::set_currencycode(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- currencycode_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.currencycode_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.PaymentMoney.currencyCode)
 }
 inline std::string* PaymentMoney::mutable_currencycode() {
@@ -22905,32 +23291,42 @@ inline std::string* PaymentMoney::mutable_currencycode() {
   return _s;
 }
 inline const std::string& PaymentMoney::_internal_currencycode() const {
-  return currencycode_.Get();
+  return _impl_.currencycode_.Get();
 }
 inline void PaymentMoney::_internal_set_currencycode(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  currencycode_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.currencycode_.Set(value, GetArenaForAllocation());
 }
 inline std::string* PaymentMoney::_internal_mutable_currencycode() {
-  _has_bits_[0] |= 0x00000001u;
-  return currencycode_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.currencycode_.Mutable(GetArenaForAllocation());
 }
 inline std::string* PaymentMoney::release_currencycode() {
   // @@protoc_insertion_point(field_release:proto.PaymentMoney.currencyCode)
   if (!_internal_has_currencycode()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return currencycode_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.currencycode_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.currencycode_.IsDefault()) {
+    _impl_.currencycode_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void PaymentMoney::set_allocated_currencycode(std::string* currencycode) {
   if (currencycode != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
+  }
+  _impl_.currencycode_.SetAllocated(currencycode, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.currencycode_.IsDefault()) {
+    _impl_.currencycode_.Set("", GetArenaForAllocation());
   }
-  currencycode_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), currencycode,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.PaymentMoney.currencyCode)
 }
 
@@ -22940,15 +23336,15 @@ inline void PaymentMoney::set_allocated_currencycode(std::string* currencycode)
 
 // optional string displayText = 1;
 inline bool HydratedQuickReplyButton::_internal_has_displaytext() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool HydratedQuickReplyButton::has_displaytext() const {
   return _internal_has_displaytext();
 }
 inline void HydratedQuickReplyButton::clear_displaytext() {
-  displaytext_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.displaytext_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& HydratedQuickReplyButton::displaytext() const {
   // @@protoc_insertion_point(field_get:proto.HydratedQuickReplyButton.displayText)
@@ -22957,8 +23353,8 @@ inline const std::string& HydratedQuickReplyButton::displaytext() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void HydratedQuickReplyButton::set_displaytext(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- displaytext_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.displaytext_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.HydratedQuickReplyButton.displayText)
 }
 inline std::string* HydratedQuickReplyButton::mutable_displaytext() {
@@ -22967,46 +23363,56 @@ inline std::string* HydratedQuickReplyButton::mutable_displaytext() {
   return _s;
 }
 inline const std::string& HydratedQuickReplyButton::_internal_displaytext() const {
-  return displaytext_.Get();
+  return _impl_.displaytext_.Get();
 }
 inline void HydratedQuickReplyButton::_internal_set_displaytext(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  displaytext_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.displaytext_.Set(value, GetArenaForAllocation());
 }
 inline std::string* HydratedQuickReplyButton::_internal_mutable_displaytext() {
-  _has_bits_[0] |= 0x00000001u;
-  return displaytext_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.displaytext_.Mutable(GetArenaForAllocation());
 }
 inline std::string* HydratedQuickReplyButton::release_displaytext() {
   // @@protoc_insertion_point(field_release:proto.HydratedQuickReplyButton.displayText)
   if (!_internal_has_displaytext()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return displaytext_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.displaytext_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.displaytext_.IsDefault()) {
+    _impl_.displaytext_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void HydratedQuickReplyButton::set_allocated_displaytext(std::string* displaytext) {
   if (displaytext != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  displaytext_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), displaytext,
-      GetArenaForAllocation());
+  _impl_.displaytext_.SetAllocated(displaytext, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.displaytext_.IsDefault()) {
+    _impl_.displaytext_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.HydratedQuickReplyButton.displayText)
 }
 
 // optional string id = 2;
 inline bool HydratedQuickReplyButton::_internal_has_id() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool HydratedQuickReplyButton::has_id() const {
   return _internal_has_id();
 }
 inline void HydratedQuickReplyButton::clear_id() {
-  id_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.id_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& HydratedQuickReplyButton::id() const {
   // @@protoc_insertion_point(field_get:proto.HydratedQuickReplyButton.id)
@@ -23015,8 +23421,8 @@ inline const std::string& HydratedQuickReplyButton::id() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void HydratedQuickReplyButton::set_id(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- id_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.id_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.HydratedQuickReplyButton.id)
 }
 inline std::string* HydratedQuickReplyButton::mutable_id() {
@@ -23025,32 +23431,42 @@ inline std::string* HydratedQuickReplyButton::mutable_id() {
   return _s;
 }
 inline const std::string& HydratedQuickReplyButton::_internal_id() const {
-  return id_.Get();
+  return _impl_.id_.Get();
 }
 inline void HydratedQuickReplyButton::_internal_set_id(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  id_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.id_.Set(value, GetArenaForAllocation());
 }
 inline std::string* HydratedQuickReplyButton::_internal_mutable_id() {
-  _has_bits_[0] |= 0x00000002u;
-  return id_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.id_.Mutable(GetArenaForAllocation());
 }
 inline std::string* HydratedQuickReplyButton::release_id() {
   // @@protoc_insertion_point(field_release:proto.HydratedQuickReplyButton.id)
   if (!_internal_has_id()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return id_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.id_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.id_.IsDefault()) {
+    _impl_.id_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void HydratedQuickReplyButton::set_allocated_id(std::string* id) {
   if (id != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  id_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), id,
-      GetArenaForAllocation());
+  _impl_.id_.SetAllocated(id, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.id_.IsDefault()) {
+    _impl_.id_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.HydratedQuickReplyButton.id)
 }
 
@@ -23060,15 +23476,15 @@ inline void HydratedQuickReplyButton::set_allocated_id(std::string* id) {
 
 // optional string displayText = 1;
 inline bool HydratedURLButton::_internal_has_displaytext() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool HydratedURLButton::has_displaytext() const {
   return _internal_has_displaytext();
 }
 inline void HydratedURLButton::clear_displaytext() {
-  displaytext_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.displaytext_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& HydratedURLButton::displaytext() const {
   // @@protoc_insertion_point(field_get:proto.HydratedURLButton.displayText)
@@ -23077,8 +23493,8 @@ inline const std::string& HydratedURLButton::displaytext() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void HydratedURLButton::set_displaytext(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- displaytext_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.displaytext_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.HydratedURLButton.displayText)
 }
 inline std::string* HydratedURLButton::mutable_displaytext() {
@@ -23087,46 +23503,56 @@ inline std::string* HydratedURLButton::mutable_displaytext() {
   return _s;
 }
 inline const std::string& HydratedURLButton::_internal_displaytext() const {
-  return displaytext_.Get();
+  return _impl_.displaytext_.Get();
 }
 inline void HydratedURLButton::_internal_set_displaytext(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  displaytext_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.displaytext_.Set(value, GetArenaForAllocation());
 }
 inline std::string* HydratedURLButton::_internal_mutable_displaytext() {
-  _has_bits_[0] |= 0x00000001u;
-  return displaytext_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.displaytext_.Mutable(GetArenaForAllocation());
 }
 inline std::string* HydratedURLButton::release_displaytext() {
   // @@protoc_insertion_point(field_release:proto.HydratedURLButton.displayText)
   if (!_internal_has_displaytext()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return displaytext_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.displaytext_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.displaytext_.IsDefault()) {
+    _impl_.displaytext_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void HydratedURLButton::set_allocated_displaytext(std::string* displaytext) {
   if (displaytext != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  displaytext_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), displaytext,
-      GetArenaForAllocation());
+  _impl_.displaytext_.SetAllocated(displaytext, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.displaytext_.IsDefault()) {
+    _impl_.displaytext_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.HydratedURLButton.displayText)
 }
 
 // optional string url = 2;
 inline bool HydratedURLButton::_internal_has_url() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool HydratedURLButton::has_url() const {
   return _internal_has_url();
 }
 inline void HydratedURLButton::clear_url() {
-  url_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.url_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& HydratedURLButton::url() const {
   // @@protoc_insertion_point(field_get:proto.HydratedURLButton.url)
@@ -23135,8 +23561,8 @@ inline const std::string& HydratedURLButton::url() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void HydratedURLButton::set_url(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- url_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.url_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.HydratedURLButton.url)
 }
 inline std::string* HydratedURLButton::mutable_url() {
@@ -23145,32 +23571,42 @@ inline std::string* HydratedURLButton::mutable_url() {
   return _s;
 }
 inline const std::string& HydratedURLButton::_internal_url() const {
-  return url_.Get();
+  return _impl_.url_.Get();
 }
 inline void HydratedURLButton::_internal_set_url(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  url_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.url_.Set(value, GetArenaForAllocation());
 }
 inline std::string* HydratedURLButton::_internal_mutable_url() {
-  _has_bits_[0] |= 0x00000002u;
-  return url_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.url_.Mutable(GetArenaForAllocation());
 }
 inline std::string* HydratedURLButton::release_url() {
   // @@protoc_insertion_point(field_release:proto.HydratedURLButton.url)
   if (!_internal_has_url()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return url_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.url_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.url_.IsDefault()) {
+    _impl_.url_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void HydratedURLButton::set_allocated_url(std::string* url) {
   if (url != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
+  }
+  _impl_.url_.SetAllocated(url, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.url_.IsDefault()) {
+    _impl_.url_.Set("", GetArenaForAllocation());
   }
-  url_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), url,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.HydratedURLButton.url)
 }
 
@@ -23180,15 +23616,15 @@ inline void HydratedURLButton::set_allocated_url(std::string* url) {
 
 // optional string displayText = 1;
 inline bool HydratedCallButton::_internal_has_displaytext() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool HydratedCallButton::has_displaytext() const {
   return _internal_has_displaytext();
 }
 inline void HydratedCallButton::clear_displaytext() {
-  displaytext_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.displaytext_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& HydratedCallButton::displaytext() const {
   // @@protoc_insertion_point(field_get:proto.HydratedCallButton.displayText)
@@ -23197,8 +23633,8 @@ inline const std::string& HydratedCallButton::displaytext() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void HydratedCallButton::set_displaytext(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- displaytext_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.displaytext_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.HydratedCallButton.displayText)
 }
 inline std::string* HydratedCallButton::mutable_displaytext() {
@@ -23207,46 +23643,56 @@ inline std::string* HydratedCallButton::mutable_displaytext() {
   return _s;
 }
 inline const std::string& HydratedCallButton::_internal_displaytext() const {
-  return displaytext_.Get();
+  return _impl_.displaytext_.Get();
 }
 inline void HydratedCallButton::_internal_set_displaytext(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  displaytext_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.displaytext_.Set(value, GetArenaForAllocation());
 }
 inline std::string* HydratedCallButton::_internal_mutable_displaytext() {
-  _has_bits_[0] |= 0x00000001u;
-  return displaytext_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.displaytext_.Mutable(GetArenaForAllocation());
 }
 inline std::string* HydratedCallButton::release_displaytext() {
   // @@protoc_insertion_point(field_release:proto.HydratedCallButton.displayText)
   if (!_internal_has_displaytext()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return displaytext_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.displaytext_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.displaytext_.IsDefault()) {
+    _impl_.displaytext_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void HydratedCallButton::set_allocated_displaytext(std::string* displaytext) {
   if (displaytext != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
+  }
+  _impl_.displaytext_.SetAllocated(displaytext, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.displaytext_.IsDefault()) {
+    _impl_.displaytext_.Set("", GetArenaForAllocation());
   }
-  displaytext_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), displaytext,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.HydratedCallButton.displayText)
 }
 
 // optional string phoneNumber = 2;
 inline bool HydratedCallButton::_internal_has_phonenumber() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool HydratedCallButton::has_phonenumber() const {
   return _internal_has_phonenumber();
 }
 inline void HydratedCallButton::clear_phonenumber() {
-  phonenumber_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.phonenumber_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& HydratedCallButton::phonenumber() const {
   // @@protoc_insertion_point(field_get:proto.HydratedCallButton.phoneNumber)
@@ -23255,8 +23701,8 @@ inline const std::string& HydratedCallButton::phonenumber() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void HydratedCallButton::set_phonenumber(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- phonenumber_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.phonenumber_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.HydratedCallButton.phoneNumber)
 }
 inline std::string* HydratedCallButton::mutable_phonenumber() {
@@ -23265,32 +23711,42 @@ inline std::string* HydratedCallButton::mutable_phonenumber() {
   return _s;
 }
 inline const std::string& HydratedCallButton::_internal_phonenumber() const {
-  return phonenumber_.Get();
+  return _impl_.phonenumber_.Get();
 }
 inline void HydratedCallButton::_internal_set_phonenumber(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  phonenumber_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.phonenumber_.Set(value, GetArenaForAllocation());
 }
 inline std::string* HydratedCallButton::_internal_mutable_phonenumber() {
-  _has_bits_[0] |= 0x00000002u;
-  return phonenumber_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.phonenumber_.Mutable(GetArenaForAllocation());
 }
 inline std::string* HydratedCallButton::release_phonenumber() {
   // @@protoc_insertion_point(field_release:proto.HydratedCallButton.phoneNumber)
   if (!_internal_has_phonenumber()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return phonenumber_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.phonenumber_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.phonenumber_.IsDefault()) {
+    _impl_.phonenumber_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void HydratedCallButton::set_allocated_phonenumber(std::string* phonenumber) {
   if (phonenumber != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
+  }
+  _impl_.phonenumber_.SetAllocated(phonenumber, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.phonenumber_.IsDefault()) {
+    _impl_.phonenumber_.Set("", GetArenaForAllocation());
   }
-  phonenumber_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), phonenumber,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.HydratedCallButton.phoneNumber)
 }
 
@@ -23300,28 +23756,28 @@ inline void HydratedCallButton::set_allocated_phonenumber(std::string* phonenumb
 
 // optional uint32 index = 4;
 inline bool HydratedTemplateButton::_internal_has_index() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool HydratedTemplateButton::has_index() const {
   return _internal_has_index();
 }
 inline void HydratedTemplateButton::clear_index() {
-  index_ = 0u;
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.index_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 HydratedTemplateButton::_internal_index() const {
-  return index_;
+inline uint32_t HydratedTemplateButton::_internal_index() const {
+  return _impl_.index_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 HydratedTemplateButton::index() const {
+inline uint32_t HydratedTemplateButton::index() const {
   // @@protoc_insertion_point(field_get:proto.HydratedTemplateButton.index)
   return _internal_index();
 }
-inline void HydratedTemplateButton::_internal_set_index(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000001u;
-  index_ = value;
+inline void HydratedTemplateButton::_internal_set_index(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.index_ = value;
 }
-inline void HydratedTemplateButton::set_index(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void HydratedTemplateButton::set_index(uint32_t value) {
   _internal_set_index(value);
   // @@protoc_insertion_point(field_set:proto.HydratedTemplateButton.index)
 }
@@ -23334,12 +23790,12 @@ inline bool HydratedTemplateButton::has_quickreplybutton() const {
   return _internal_has_quickreplybutton();
 }
 inline void HydratedTemplateButton::set_has_quickreplybutton() {
-  _oneof_case_[0] = kQuickReplyButton;
+  _impl_._oneof_case_[0] = kQuickReplyButton;
 }
 inline void HydratedTemplateButton::clear_quickreplybutton() {
   if (_internal_has_quickreplybutton()) {
     if (GetArenaForAllocation() == nullptr) {
-      delete hydratedButton_.quickreplybutton_;
+      delete _impl_.hydratedButton_.quickreplybutton_;
     }
     clear_has_hydratedButton();
   }
@@ -23348,11 +23804,11 @@ inline ::proto::HydratedQuickReplyButton* HydratedTemplateButton::release_quickr
   // @@protoc_insertion_point(field_release:proto.HydratedTemplateButton.quickReplyButton)
   if (_internal_has_quickreplybutton()) {
     clear_has_hydratedButton();
-      ::proto::HydratedQuickReplyButton* temp = hydratedButton_.quickreplybutton_;
+    ::proto::HydratedQuickReplyButton* temp = _impl_.hydratedButton_.quickreplybutton_;
     if (GetArenaForAllocation() != nullptr) {
       temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
     }
-    hydratedButton_.quickreplybutton_ = nullptr;
+    _impl_.hydratedButton_.quickreplybutton_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -23360,7 +23816,7 @@ inline ::proto::HydratedQuickReplyButton* HydratedTemplateButton::release_quickr
 }
 inline const ::proto::HydratedQuickReplyButton& HydratedTemplateButton::_internal_quickreplybutton() const {
   return _internal_has_quickreplybutton()
-      ? *hydratedButton_.quickreplybutton_
+      ? *_impl_.hydratedButton_.quickreplybutton_
       : reinterpret_cast< ::proto::HydratedQuickReplyButton&>(::proto::_HydratedQuickReplyButton_default_instance_);
 }
 inline const ::proto::HydratedQuickReplyButton& HydratedTemplateButton::quickreplybutton() const {
@@ -23371,8 +23827,8 @@ inline ::proto::HydratedQuickReplyButton* HydratedTemplateButton::unsafe_arena_r
   // @@protoc_insertion_point(field_unsafe_arena_release:proto.HydratedTemplateButton.quickReplyButton)
   if (_internal_has_quickreplybutton()) {
     clear_has_hydratedButton();
-    ::proto::HydratedQuickReplyButton* temp = hydratedButton_.quickreplybutton_;
-    hydratedButton_.quickreplybutton_ = nullptr;
+    ::proto::HydratedQuickReplyButton* temp = _impl_.hydratedButton_.quickreplybutton_;
+    _impl_.hydratedButton_.quickreplybutton_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -23382,7 +23838,7 @@ inline void HydratedTemplateButton::unsafe_arena_set_allocated_quickreplybutton(
   clear_hydratedButton();
   if (quickreplybutton) {
     set_has_quickreplybutton();
-    hydratedButton_.quickreplybutton_ = quickreplybutton;
+    _impl_.hydratedButton_.quickreplybutton_ = quickreplybutton;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.HydratedTemplateButton.quickReplyButton)
 }
@@ -23390,9 +23846,9 @@ inline ::proto::HydratedQuickReplyButton* HydratedTemplateButton::_internal_muta
   if (!_internal_has_quickreplybutton()) {
     clear_hydratedButton();
     set_has_quickreplybutton();
-    hydratedButton_.quickreplybutton_ = CreateMaybeMessage< ::proto::HydratedQuickReplyButton >(GetArenaForAllocation());
+    _impl_.hydratedButton_.quickreplybutton_ = CreateMaybeMessage< ::proto::HydratedQuickReplyButton >(GetArenaForAllocation());
   }
-  return hydratedButton_.quickreplybutton_;
+  return _impl_.hydratedButton_.quickreplybutton_;
 }
 inline ::proto::HydratedQuickReplyButton* HydratedTemplateButton::mutable_quickreplybutton() {
   ::proto::HydratedQuickReplyButton* _msg = _internal_mutable_quickreplybutton();
@@ -23408,12 +23864,12 @@ inline bool HydratedTemplateButton::has_urlbutton() const {
   return _internal_has_urlbutton();
 }
 inline void HydratedTemplateButton::set_has_urlbutton() {
-  _oneof_case_[0] = kUrlButton;
+  _impl_._oneof_case_[0] = kUrlButton;
 }
 inline void HydratedTemplateButton::clear_urlbutton() {
   if (_internal_has_urlbutton()) {
     if (GetArenaForAllocation() == nullptr) {
-      delete hydratedButton_.urlbutton_;
+      delete _impl_.hydratedButton_.urlbutton_;
     }
     clear_has_hydratedButton();
   }
@@ -23422,11 +23878,11 @@ inline ::proto::HydratedURLButton* HydratedTemplateButton::release_urlbutton() {
   // @@protoc_insertion_point(field_release:proto.HydratedTemplateButton.urlButton)
   if (_internal_has_urlbutton()) {
     clear_has_hydratedButton();
-      ::proto::HydratedURLButton* temp = hydratedButton_.urlbutton_;
+    ::proto::HydratedURLButton* temp = _impl_.hydratedButton_.urlbutton_;
     if (GetArenaForAllocation() != nullptr) {
       temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
     }
-    hydratedButton_.urlbutton_ = nullptr;
+    _impl_.hydratedButton_.urlbutton_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -23434,7 +23890,7 @@ inline ::proto::HydratedURLButton* HydratedTemplateButton::release_urlbutton() {
 }
 inline const ::proto::HydratedURLButton& HydratedTemplateButton::_internal_urlbutton() const {
   return _internal_has_urlbutton()
-      ? *hydratedButton_.urlbutton_
+      ? *_impl_.hydratedButton_.urlbutton_
       : reinterpret_cast< ::proto::HydratedURLButton&>(::proto::_HydratedURLButton_default_instance_);
 }
 inline const ::proto::HydratedURLButton& HydratedTemplateButton::urlbutton() const {
@@ -23445,8 +23901,8 @@ inline ::proto::HydratedURLButton* HydratedTemplateButton::unsafe_arena_release_
   // @@protoc_insertion_point(field_unsafe_arena_release:proto.HydratedTemplateButton.urlButton)
   if (_internal_has_urlbutton()) {
     clear_has_hydratedButton();
-    ::proto::HydratedURLButton* temp = hydratedButton_.urlbutton_;
-    hydratedButton_.urlbutton_ = nullptr;
+    ::proto::HydratedURLButton* temp = _impl_.hydratedButton_.urlbutton_;
+    _impl_.hydratedButton_.urlbutton_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -23456,7 +23912,7 @@ inline void HydratedTemplateButton::unsafe_arena_set_allocated_urlbutton(::proto
   clear_hydratedButton();
   if (urlbutton) {
     set_has_urlbutton();
-    hydratedButton_.urlbutton_ = urlbutton;
+    _impl_.hydratedButton_.urlbutton_ = urlbutton;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.HydratedTemplateButton.urlButton)
 }
@@ -23464,9 +23920,9 @@ inline ::proto::HydratedURLButton* HydratedTemplateButton::_internal_mutable_url
   if (!_internal_has_urlbutton()) {
     clear_hydratedButton();
     set_has_urlbutton();
-    hydratedButton_.urlbutton_ = CreateMaybeMessage< ::proto::HydratedURLButton >(GetArenaForAllocation());
+    _impl_.hydratedButton_.urlbutton_ = CreateMaybeMessage< ::proto::HydratedURLButton >(GetArenaForAllocation());
   }
-  return hydratedButton_.urlbutton_;
+  return _impl_.hydratedButton_.urlbutton_;
 }
 inline ::proto::HydratedURLButton* HydratedTemplateButton::mutable_urlbutton() {
   ::proto::HydratedURLButton* _msg = _internal_mutable_urlbutton();
@@ -23482,12 +23938,12 @@ inline bool HydratedTemplateButton::has_callbutton() const {
   return _internal_has_callbutton();
 }
 inline void HydratedTemplateButton::set_has_callbutton() {
-  _oneof_case_[0] = kCallButton;
+  _impl_._oneof_case_[0] = kCallButton;
 }
 inline void HydratedTemplateButton::clear_callbutton() {
   if (_internal_has_callbutton()) {
     if (GetArenaForAllocation() == nullptr) {
-      delete hydratedButton_.callbutton_;
+      delete _impl_.hydratedButton_.callbutton_;
     }
     clear_has_hydratedButton();
   }
@@ -23496,11 +23952,11 @@ inline ::proto::HydratedCallButton* HydratedTemplateButton::release_callbutton()
   // @@protoc_insertion_point(field_release:proto.HydratedTemplateButton.callButton)
   if (_internal_has_callbutton()) {
     clear_has_hydratedButton();
-      ::proto::HydratedCallButton* temp = hydratedButton_.callbutton_;
+    ::proto::HydratedCallButton* temp = _impl_.hydratedButton_.callbutton_;
     if (GetArenaForAllocation() != nullptr) {
       temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
     }
-    hydratedButton_.callbutton_ = nullptr;
+    _impl_.hydratedButton_.callbutton_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -23508,7 +23964,7 @@ inline ::proto::HydratedCallButton* HydratedTemplateButton::release_callbutton()
 }
 inline const ::proto::HydratedCallButton& HydratedTemplateButton::_internal_callbutton() const {
   return _internal_has_callbutton()
-      ? *hydratedButton_.callbutton_
+      ? *_impl_.hydratedButton_.callbutton_
       : reinterpret_cast< ::proto::HydratedCallButton&>(::proto::_HydratedCallButton_default_instance_);
 }
 inline const ::proto::HydratedCallButton& HydratedTemplateButton::callbutton() const {
@@ -23519,8 +23975,8 @@ inline ::proto::HydratedCallButton* HydratedTemplateButton::unsafe_arena_release
   // @@protoc_insertion_point(field_unsafe_arena_release:proto.HydratedTemplateButton.callButton)
   if (_internal_has_callbutton()) {
     clear_has_hydratedButton();
-    ::proto::HydratedCallButton* temp = hydratedButton_.callbutton_;
-    hydratedButton_.callbutton_ = nullptr;
+    ::proto::HydratedCallButton* temp = _impl_.hydratedButton_.callbutton_;
+    _impl_.hydratedButton_.callbutton_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -23530,7 +23986,7 @@ inline void HydratedTemplateButton::unsafe_arena_set_allocated_callbutton(::prot
   clear_hydratedButton();
   if (callbutton) {
     set_has_callbutton();
-    hydratedButton_.callbutton_ = callbutton;
+    _impl_.hydratedButton_.callbutton_ = callbutton;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.HydratedTemplateButton.callButton)
 }
@@ -23538,9 +23994,9 @@ inline ::proto::HydratedCallButton* HydratedTemplateButton::_internal_mutable_ca
   if (!_internal_has_callbutton()) {
     clear_hydratedButton();
     set_has_callbutton();
-    hydratedButton_.callbutton_ = CreateMaybeMessage< ::proto::HydratedCallButton >(GetArenaForAllocation());
+    _impl_.hydratedButton_.callbutton_ = CreateMaybeMessage< ::proto::HydratedCallButton >(GetArenaForAllocation());
   }
-  return hydratedButton_.callbutton_;
+  return _impl_.hydratedButton_.callbutton_;
 }
 inline ::proto::HydratedCallButton* HydratedTemplateButton::mutable_callbutton() {
   ::proto::HydratedCallButton* _msg = _internal_mutable_callbutton();
@@ -23552,10 +24008,10 @@ inline bool HydratedTemplateButton::has_hydratedButton() const {
   return hydratedButton_case() != HYDRATEDBUTTON_NOT_SET;
 }
 inline void HydratedTemplateButton::clear_has_hydratedButton() {
-  _oneof_case_[0] = HYDRATEDBUTTON_NOT_SET;
+  _impl_._oneof_case_[0] = HYDRATEDBUTTON_NOT_SET;
 }
 inline HydratedTemplateButton::HydratedButtonCase HydratedTemplateButton::hydratedButton_case() const {
-  return HydratedTemplateButton::HydratedButtonCase(_oneof_case_[0]);
+  return HydratedTemplateButton::HydratedButtonCase(_impl_._oneof_case_[0]);
 }
 // -------------------------------------------------------------------
 
@@ -23563,19 +24019,19 @@ inline HydratedTemplateButton::HydratedButtonCase HydratedTemplateButton::hydrat
 
 // optional .proto.HighlyStructuredMessage displayText = 1;
 inline bool QuickReplyButton::_internal_has_displaytext() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || displaytext_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.displaytext_ != nullptr);
   return value;
 }
 inline bool QuickReplyButton::has_displaytext() const {
   return _internal_has_displaytext();
 }
 inline void QuickReplyButton::clear_displaytext() {
-  if (displaytext_ != nullptr) displaytext_->Clear();
-  _has_bits_[0] &= ~0x00000002u;
+  if (_impl_.displaytext_ != nullptr) _impl_.displaytext_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const ::proto::HighlyStructuredMessage& QuickReplyButton::_internal_displaytext() const {
-  const ::proto::HighlyStructuredMessage* p = displaytext_;
+  const ::proto::HighlyStructuredMessage* p = _impl_.displaytext_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::HighlyStructuredMessage&>(
       ::proto::_HighlyStructuredMessage_default_instance_);
 }
@@ -23586,20 +24042,20 @@ inline const ::proto::HighlyStructuredMessage& QuickReplyButton::displaytext() c
 inline void QuickReplyButton::unsafe_arena_set_allocated_displaytext(
     ::proto::HighlyStructuredMessage* displaytext) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(displaytext_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.displaytext_);
   }
-  displaytext_ = displaytext;
+  _impl_.displaytext_ = displaytext;
   if (displaytext) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.QuickReplyButton.displayText)
 }
 inline ::proto::HighlyStructuredMessage* QuickReplyButton::release_displaytext() {
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::HighlyStructuredMessage* temp = displaytext_;
-  displaytext_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::HighlyStructuredMessage* temp = _impl_.displaytext_;
+  _impl_.displaytext_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -23613,18 +24069,18 @@ inline ::proto::HighlyStructuredMessage* QuickReplyButton::release_displaytext()
 }
 inline ::proto::HighlyStructuredMessage* QuickReplyButton::unsafe_arena_release_displaytext() {
   // @@protoc_insertion_point(field_release:proto.QuickReplyButton.displayText)
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::HighlyStructuredMessage* temp = displaytext_;
-  displaytext_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::HighlyStructuredMessage* temp = _impl_.displaytext_;
+  _impl_.displaytext_ = nullptr;
   return temp;
 }
 inline ::proto::HighlyStructuredMessage* QuickReplyButton::_internal_mutable_displaytext() {
-  _has_bits_[0] |= 0x00000002u;
-  if (displaytext_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000002u;
+  if (_impl_.displaytext_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::HighlyStructuredMessage>(GetArenaForAllocation());
-    displaytext_ = p;
+    _impl_.displaytext_ = p;
   }
-  return displaytext_;
+  return _impl_.displaytext_;
 }
 inline ::proto::HighlyStructuredMessage* QuickReplyButton::mutable_displaytext() {
   ::proto::HighlyStructuredMessage* _msg = _internal_mutable_displaytext();
@@ -23634,34 +24090,34 @@ inline ::proto::HighlyStructuredMessage* QuickReplyButton::mutable_displaytext()
 inline void QuickReplyButton::set_allocated_displaytext(::proto::HighlyStructuredMessage* displaytext) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete displaytext_;
+    delete _impl_.displaytext_;
   }
   if (displaytext) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::HighlyStructuredMessage>::GetOwningArena(displaytext);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(displaytext);
     if (message_arena != submessage_arena) {
       displaytext = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, displaytext, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  displaytext_ = displaytext;
+  _impl_.displaytext_ = displaytext;
   // @@protoc_insertion_point(field_set_allocated:proto.QuickReplyButton.displayText)
 }
 
 // optional string id = 2;
 inline bool QuickReplyButton::_internal_has_id() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool QuickReplyButton::has_id() const {
   return _internal_has_id();
 }
 inline void QuickReplyButton::clear_id() {
-  id_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.id_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& QuickReplyButton::id() const {
   // @@protoc_insertion_point(field_get:proto.QuickReplyButton.id)
@@ -23670,8 +24126,8 @@ inline const std::string& QuickReplyButton::id() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void QuickReplyButton::set_id(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- id_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.id_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.QuickReplyButton.id)
 }
 inline std::string* QuickReplyButton::mutable_id() {
@@ -23680,32 +24136,42 @@ inline std::string* QuickReplyButton::mutable_id() {
   return _s;
 }
 inline const std::string& QuickReplyButton::_internal_id() const {
-  return id_.Get();
+  return _impl_.id_.Get();
 }
 inline void QuickReplyButton::_internal_set_id(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  id_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.id_.Set(value, GetArenaForAllocation());
 }
 inline std::string* QuickReplyButton::_internal_mutable_id() {
-  _has_bits_[0] |= 0x00000001u;
-  return id_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.id_.Mutable(GetArenaForAllocation());
 }
 inline std::string* QuickReplyButton::release_id() {
   // @@protoc_insertion_point(field_release:proto.QuickReplyButton.id)
   if (!_internal_has_id()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return id_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.id_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.id_.IsDefault()) {
+    _impl_.id_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void QuickReplyButton::set_allocated_id(std::string* id) {
   if (id != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
+  }
+  _impl_.id_.SetAllocated(id, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.id_.IsDefault()) {
+    _impl_.id_.Set("", GetArenaForAllocation());
   }
-  id_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), id,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.QuickReplyButton.id)
 }
 
@@ -23715,19 +24181,19 @@ inline void QuickReplyButton::set_allocated_id(std::string* id) {
 
 // optional .proto.HighlyStructuredMessage displayText = 1;
 inline bool URLButton::_internal_has_displaytext() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || displaytext_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.displaytext_ != nullptr);
   return value;
 }
 inline bool URLButton::has_displaytext() const {
   return _internal_has_displaytext();
 }
 inline void URLButton::clear_displaytext() {
-  if (displaytext_ != nullptr) displaytext_->Clear();
-  _has_bits_[0] &= ~0x00000001u;
+  if (_impl_.displaytext_ != nullptr) _impl_.displaytext_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const ::proto::HighlyStructuredMessage& URLButton::_internal_displaytext() const {
-  const ::proto::HighlyStructuredMessage* p = displaytext_;
+  const ::proto::HighlyStructuredMessage* p = _impl_.displaytext_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::HighlyStructuredMessage&>(
       ::proto::_HighlyStructuredMessage_default_instance_);
 }
@@ -23738,20 +24204,20 @@ inline const ::proto::HighlyStructuredMessage& URLButton::displaytext() const {
 inline void URLButton::unsafe_arena_set_allocated_displaytext(
     ::proto::HighlyStructuredMessage* displaytext) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(displaytext_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.displaytext_);
   }
-  displaytext_ = displaytext;
+  _impl_.displaytext_ = displaytext;
   if (displaytext) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.URLButton.displayText)
 }
 inline ::proto::HighlyStructuredMessage* URLButton::release_displaytext() {
-  _has_bits_[0] &= ~0x00000001u;
-  ::proto::HighlyStructuredMessage* temp = displaytext_;
-  displaytext_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  ::proto::HighlyStructuredMessage* temp = _impl_.displaytext_;
+  _impl_.displaytext_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -23765,18 +24231,18 @@ inline ::proto::HighlyStructuredMessage* URLButton::release_displaytext() {
 }
 inline ::proto::HighlyStructuredMessage* URLButton::unsafe_arena_release_displaytext() {
   // @@protoc_insertion_point(field_release:proto.URLButton.displayText)
-  _has_bits_[0] &= ~0x00000001u;
-  ::proto::HighlyStructuredMessage* temp = displaytext_;
-  displaytext_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  ::proto::HighlyStructuredMessage* temp = _impl_.displaytext_;
+  _impl_.displaytext_ = nullptr;
   return temp;
 }
 inline ::proto::HighlyStructuredMessage* URLButton::_internal_mutable_displaytext() {
-  _has_bits_[0] |= 0x00000001u;
-  if (displaytext_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000001u;
+  if (_impl_.displaytext_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::HighlyStructuredMessage>(GetArenaForAllocation());
-    displaytext_ = p;
+    _impl_.displaytext_ = p;
   }
-  return displaytext_;
+  return _impl_.displaytext_;
 }
 inline ::proto::HighlyStructuredMessage* URLButton::mutable_displaytext() {
   ::proto::HighlyStructuredMessage* _msg = _internal_mutable_displaytext();
@@ -23786,38 +24252,38 @@ inline ::proto::HighlyStructuredMessage* URLButton::mutable_displaytext() {
 inline void URLButton::set_allocated_displaytext(::proto::HighlyStructuredMessage* displaytext) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete displaytext_;
+    delete _impl_.displaytext_;
   }
   if (displaytext) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::HighlyStructuredMessage>::GetOwningArena(displaytext);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(displaytext);
     if (message_arena != submessage_arena) {
       displaytext = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, displaytext, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  displaytext_ = displaytext;
+  _impl_.displaytext_ = displaytext;
   // @@protoc_insertion_point(field_set_allocated:proto.URLButton.displayText)
 }
 
 // optional .proto.HighlyStructuredMessage url = 2;
 inline bool URLButton::_internal_has_url() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || url_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.url_ != nullptr);
   return value;
 }
 inline bool URLButton::has_url() const {
   return _internal_has_url();
 }
 inline void URLButton::clear_url() {
-  if (url_ != nullptr) url_->Clear();
-  _has_bits_[0] &= ~0x00000002u;
+  if (_impl_.url_ != nullptr) _impl_.url_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const ::proto::HighlyStructuredMessage& URLButton::_internal_url() const {
-  const ::proto::HighlyStructuredMessage* p = url_;
+  const ::proto::HighlyStructuredMessage* p = _impl_.url_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::HighlyStructuredMessage&>(
       ::proto::_HighlyStructuredMessage_default_instance_);
 }
@@ -23828,20 +24294,20 @@ inline const ::proto::HighlyStructuredMessage& URLButton::url() const {
 inline void URLButton::unsafe_arena_set_allocated_url(
     ::proto::HighlyStructuredMessage* url) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(url_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.url_);
   }
-  url_ = url;
+  _impl_.url_ = url;
   if (url) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.URLButton.url)
 }
 inline ::proto::HighlyStructuredMessage* URLButton::release_url() {
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::HighlyStructuredMessage* temp = url_;
-  url_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::HighlyStructuredMessage* temp = _impl_.url_;
+  _impl_.url_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -23855,18 +24321,18 @@ inline ::proto::HighlyStructuredMessage* URLButton::release_url() {
 }
 inline ::proto::HighlyStructuredMessage* URLButton::unsafe_arena_release_url() {
   // @@protoc_insertion_point(field_release:proto.URLButton.url)
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::HighlyStructuredMessage* temp = url_;
-  url_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::HighlyStructuredMessage* temp = _impl_.url_;
+  _impl_.url_ = nullptr;
   return temp;
 }
 inline ::proto::HighlyStructuredMessage* URLButton::_internal_mutable_url() {
-  _has_bits_[0] |= 0x00000002u;
-  if (url_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000002u;
+  if (_impl_.url_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::HighlyStructuredMessage>(GetArenaForAllocation());
-    url_ = p;
+    _impl_.url_ = p;
   }
-  return url_;
+  return _impl_.url_;
 }
 inline ::proto::HighlyStructuredMessage* URLButton::mutable_url() {
   ::proto::HighlyStructuredMessage* _msg = _internal_mutable_url();
@@ -23876,20 +24342,20 @@ inline ::proto::HighlyStructuredMessage* URLButton::mutable_url() {
 inline void URLButton::set_allocated_url(::proto::HighlyStructuredMessage* url) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete url_;
+    delete _impl_.url_;
   }
   if (url) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::HighlyStructuredMessage>::GetOwningArena(url);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(url);
     if (message_arena != submessage_arena) {
       url = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, url, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  url_ = url;
+  _impl_.url_ = url;
   // @@protoc_insertion_point(field_set_allocated:proto.URLButton.url)
 }
 
@@ -23899,19 +24365,19 @@ inline void URLButton::set_allocated_url(::proto::HighlyStructuredMessage* url)
 
 // optional .proto.HighlyStructuredMessage displayText = 1;
 inline bool CallButton::_internal_has_displaytext() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || displaytext_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.displaytext_ != nullptr);
   return value;
 }
 inline bool CallButton::has_displaytext() const {
   return _internal_has_displaytext();
 }
 inline void CallButton::clear_displaytext() {
-  if (displaytext_ != nullptr) displaytext_->Clear();
-  _has_bits_[0] &= ~0x00000001u;
+  if (_impl_.displaytext_ != nullptr) _impl_.displaytext_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const ::proto::HighlyStructuredMessage& CallButton::_internal_displaytext() const {
-  const ::proto::HighlyStructuredMessage* p = displaytext_;
+  const ::proto::HighlyStructuredMessage* p = _impl_.displaytext_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::HighlyStructuredMessage&>(
       ::proto::_HighlyStructuredMessage_default_instance_);
 }
@@ -23922,20 +24388,20 @@ inline const ::proto::HighlyStructuredMessage& CallButton::displaytext() const {
 inline void CallButton::unsafe_arena_set_allocated_displaytext(
     ::proto::HighlyStructuredMessage* displaytext) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(displaytext_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.displaytext_);
   }
-  displaytext_ = displaytext;
+  _impl_.displaytext_ = displaytext;
   if (displaytext) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.CallButton.displayText)
 }
 inline ::proto::HighlyStructuredMessage* CallButton::release_displaytext() {
-  _has_bits_[0] &= ~0x00000001u;
-  ::proto::HighlyStructuredMessage* temp = displaytext_;
-  displaytext_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  ::proto::HighlyStructuredMessage* temp = _impl_.displaytext_;
+  _impl_.displaytext_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -23949,18 +24415,18 @@ inline ::proto::HighlyStructuredMessage* CallButton::release_displaytext() {
 }
 inline ::proto::HighlyStructuredMessage* CallButton::unsafe_arena_release_displaytext() {
   // @@protoc_insertion_point(field_release:proto.CallButton.displayText)
-  _has_bits_[0] &= ~0x00000001u;
-  ::proto::HighlyStructuredMessage* temp = displaytext_;
-  displaytext_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  ::proto::HighlyStructuredMessage* temp = _impl_.displaytext_;
+  _impl_.displaytext_ = nullptr;
   return temp;
 }
 inline ::proto::HighlyStructuredMessage* CallButton::_internal_mutable_displaytext() {
-  _has_bits_[0] |= 0x00000001u;
-  if (displaytext_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000001u;
+  if (_impl_.displaytext_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::HighlyStructuredMessage>(GetArenaForAllocation());
-    displaytext_ = p;
+    _impl_.displaytext_ = p;
   }
-  return displaytext_;
+  return _impl_.displaytext_;
 }
 inline ::proto::HighlyStructuredMessage* CallButton::mutable_displaytext() {
   ::proto::HighlyStructuredMessage* _msg = _internal_mutable_displaytext();
@@ -23970,38 +24436,38 @@ inline ::proto::HighlyStructuredMessage* CallButton::mutable_displaytext() {
 inline void CallButton::set_allocated_displaytext(::proto::HighlyStructuredMessage* displaytext) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete displaytext_;
+    delete _impl_.displaytext_;
   }
   if (displaytext) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::HighlyStructuredMessage>::GetOwningArena(displaytext);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(displaytext);
     if (message_arena != submessage_arena) {
       displaytext = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, displaytext, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  displaytext_ = displaytext;
+  _impl_.displaytext_ = displaytext;
   // @@protoc_insertion_point(field_set_allocated:proto.CallButton.displayText)
 }
 
 // optional .proto.HighlyStructuredMessage phoneNumber = 2;
 inline bool CallButton::_internal_has_phonenumber() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || phonenumber_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.phonenumber_ != nullptr);
   return value;
 }
 inline bool CallButton::has_phonenumber() const {
   return _internal_has_phonenumber();
 }
 inline void CallButton::clear_phonenumber() {
-  if (phonenumber_ != nullptr) phonenumber_->Clear();
-  _has_bits_[0] &= ~0x00000002u;
+  if (_impl_.phonenumber_ != nullptr) _impl_.phonenumber_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const ::proto::HighlyStructuredMessage& CallButton::_internal_phonenumber() const {
-  const ::proto::HighlyStructuredMessage* p = phonenumber_;
+  const ::proto::HighlyStructuredMessage* p = _impl_.phonenumber_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::HighlyStructuredMessage&>(
       ::proto::_HighlyStructuredMessage_default_instance_);
 }
@@ -24012,20 +24478,20 @@ inline const ::proto::HighlyStructuredMessage& CallButton::phonenumber() const {
 inline void CallButton::unsafe_arena_set_allocated_phonenumber(
     ::proto::HighlyStructuredMessage* phonenumber) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(phonenumber_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.phonenumber_);
   }
-  phonenumber_ = phonenumber;
+  _impl_.phonenumber_ = phonenumber;
   if (phonenumber) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.CallButton.phoneNumber)
 }
 inline ::proto::HighlyStructuredMessage* CallButton::release_phonenumber() {
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::HighlyStructuredMessage* temp = phonenumber_;
-  phonenumber_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::HighlyStructuredMessage* temp = _impl_.phonenumber_;
+  _impl_.phonenumber_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -24039,18 +24505,18 @@ inline ::proto::HighlyStructuredMessage* CallButton::release_phonenumber() {
 }
 inline ::proto::HighlyStructuredMessage* CallButton::unsafe_arena_release_phonenumber() {
   // @@protoc_insertion_point(field_release:proto.CallButton.phoneNumber)
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::HighlyStructuredMessage* temp = phonenumber_;
-  phonenumber_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::HighlyStructuredMessage* temp = _impl_.phonenumber_;
+  _impl_.phonenumber_ = nullptr;
   return temp;
 }
 inline ::proto::HighlyStructuredMessage* CallButton::_internal_mutable_phonenumber() {
-  _has_bits_[0] |= 0x00000002u;
-  if (phonenumber_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000002u;
+  if (_impl_.phonenumber_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::HighlyStructuredMessage>(GetArenaForAllocation());
-    phonenumber_ = p;
+    _impl_.phonenumber_ = p;
   }
-  return phonenumber_;
+  return _impl_.phonenumber_;
 }
 inline ::proto::HighlyStructuredMessage* CallButton::mutable_phonenumber() {
   ::proto::HighlyStructuredMessage* _msg = _internal_mutable_phonenumber();
@@ -24060,20 +24526,20 @@ inline ::proto::HighlyStructuredMessage* CallButton::mutable_phonenumber() {
 inline void CallButton::set_allocated_phonenumber(::proto::HighlyStructuredMessage* phonenumber) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete phonenumber_;
+    delete _impl_.phonenumber_;
   }
   if (phonenumber) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::HighlyStructuredMessage>::GetOwningArena(phonenumber);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(phonenumber);
     if (message_arena != submessage_arena) {
       phonenumber = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, phonenumber, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  phonenumber_ = phonenumber;
+  _impl_.phonenumber_ = phonenumber;
   // @@protoc_insertion_point(field_set_allocated:proto.CallButton.phoneNumber)
 }
 
@@ -24083,28 +24549,28 @@ inline void CallButton::set_allocated_phonenumber(::proto::HighlyStructuredMessa
 
 // optional uint32 index = 4;
 inline bool TemplateButton::_internal_has_index() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool TemplateButton::has_index() const {
   return _internal_has_index();
 }
 inline void TemplateButton::clear_index() {
-  index_ = 0u;
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.index_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 TemplateButton::_internal_index() const {
-  return index_;
+inline uint32_t TemplateButton::_internal_index() const {
+  return _impl_.index_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 TemplateButton::index() const {
+inline uint32_t TemplateButton::index() const {
   // @@protoc_insertion_point(field_get:proto.TemplateButton.index)
   return _internal_index();
 }
-inline void TemplateButton::_internal_set_index(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000001u;
-  index_ = value;
+inline void TemplateButton::_internal_set_index(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.index_ = value;
 }
-inline void TemplateButton::set_index(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void TemplateButton::set_index(uint32_t value) {
   _internal_set_index(value);
   // @@protoc_insertion_point(field_set:proto.TemplateButton.index)
 }
@@ -24117,12 +24583,12 @@ inline bool TemplateButton::has_quickreplybutton() const {
   return _internal_has_quickreplybutton();
 }
 inline void TemplateButton::set_has_quickreplybutton() {
-  _oneof_case_[0] = kQuickReplyButton;
+  _impl_._oneof_case_[0] = kQuickReplyButton;
 }
 inline void TemplateButton::clear_quickreplybutton() {
   if (_internal_has_quickreplybutton()) {
     if (GetArenaForAllocation() == nullptr) {
-      delete button_.quickreplybutton_;
+      delete _impl_.button_.quickreplybutton_;
     }
     clear_has_button();
   }
@@ -24131,11 +24597,11 @@ inline ::proto::QuickReplyButton* TemplateButton::release_quickreplybutton() {
   // @@protoc_insertion_point(field_release:proto.TemplateButton.quickReplyButton)
   if (_internal_has_quickreplybutton()) {
     clear_has_button();
-      ::proto::QuickReplyButton* temp = button_.quickreplybutton_;
+    ::proto::QuickReplyButton* temp = _impl_.button_.quickreplybutton_;
     if (GetArenaForAllocation() != nullptr) {
       temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
     }
-    button_.quickreplybutton_ = nullptr;
+    _impl_.button_.quickreplybutton_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -24143,7 +24609,7 @@ inline ::proto::QuickReplyButton* TemplateButton::release_quickreplybutton() {
 }
 inline const ::proto::QuickReplyButton& TemplateButton::_internal_quickreplybutton() const {
   return _internal_has_quickreplybutton()
-      ? *button_.quickreplybutton_
+      ? *_impl_.button_.quickreplybutton_
       : reinterpret_cast< ::proto::QuickReplyButton&>(::proto::_QuickReplyButton_default_instance_);
 }
 inline const ::proto::QuickReplyButton& TemplateButton::quickreplybutton() const {
@@ -24154,8 +24620,8 @@ inline ::proto::QuickReplyButton* TemplateButton::unsafe_arena_release_quickrepl
   // @@protoc_insertion_point(field_unsafe_arena_release:proto.TemplateButton.quickReplyButton)
   if (_internal_has_quickreplybutton()) {
     clear_has_button();
-    ::proto::QuickReplyButton* temp = button_.quickreplybutton_;
-    button_.quickreplybutton_ = nullptr;
+    ::proto::QuickReplyButton* temp = _impl_.button_.quickreplybutton_;
+    _impl_.button_.quickreplybutton_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -24165,7 +24631,7 @@ inline void TemplateButton::unsafe_arena_set_allocated_quickreplybutton(::proto:
   clear_button();
   if (quickreplybutton) {
     set_has_quickreplybutton();
-    button_.quickreplybutton_ = quickreplybutton;
+    _impl_.button_.quickreplybutton_ = quickreplybutton;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.TemplateButton.quickReplyButton)
 }
@@ -24173,9 +24639,9 @@ inline ::proto::QuickReplyButton* TemplateButton::_internal_mutable_quickreplybu
   if (!_internal_has_quickreplybutton()) {
     clear_button();
     set_has_quickreplybutton();
-    button_.quickreplybutton_ = CreateMaybeMessage< ::proto::QuickReplyButton >(GetArenaForAllocation());
+    _impl_.button_.quickreplybutton_ = CreateMaybeMessage< ::proto::QuickReplyButton >(GetArenaForAllocation());
   }
-  return button_.quickreplybutton_;
+  return _impl_.button_.quickreplybutton_;
 }
 inline ::proto::QuickReplyButton* TemplateButton::mutable_quickreplybutton() {
   ::proto::QuickReplyButton* _msg = _internal_mutable_quickreplybutton();
@@ -24191,12 +24657,12 @@ inline bool TemplateButton::has_urlbutton() const {
   return _internal_has_urlbutton();
 }
 inline void TemplateButton::set_has_urlbutton() {
-  _oneof_case_[0] = kUrlButton;
+  _impl_._oneof_case_[0] = kUrlButton;
 }
 inline void TemplateButton::clear_urlbutton() {
   if (_internal_has_urlbutton()) {
     if (GetArenaForAllocation() == nullptr) {
-      delete button_.urlbutton_;
+      delete _impl_.button_.urlbutton_;
     }
     clear_has_button();
   }
@@ -24205,11 +24671,11 @@ inline ::proto::URLButton* TemplateButton::release_urlbutton() {
   // @@protoc_insertion_point(field_release:proto.TemplateButton.urlButton)
   if (_internal_has_urlbutton()) {
     clear_has_button();
-      ::proto::URLButton* temp = button_.urlbutton_;
+    ::proto::URLButton* temp = _impl_.button_.urlbutton_;
     if (GetArenaForAllocation() != nullptr) {
       temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
     }
-    button_.urlbutton_ = nullptr;
+    _impl_.button_.urlbutton_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -24217,7 +24683,7 @@ inline ::proto::URLButton* TemplateButton::release_urlbutton() {
 }
 inline const ::proto::URLButton& TemplateButton::_internal_urlbutton() const {
   return _internal_has_urlbutton()
-      ? *button_.urlbutton_
+      ? *_impl_.button_.urlbutton_
       : reinterpret_cast< ::proto::URLButton&>(::proto::_URLButton_default_instance_);
 }
 inline const ::proto::URLButton& TemplateButton::urlbutton() const {
@@ -24228,8 +24694,8 @@ inline ::proto::URLButton* TemplateButton::unsafe_arena_release_urlbutton() {
   // @@protoc_insertion_point(field_unsafe_arena_release:proto.TemplateButton.urlButton)
   if (_internal_has_urlbutton()) {
     clear_has_button();
-    ::proto::URLButton* temp = button_.urlbutton_;
-    button_.urlbutton_ = nullptr;
+    ::proto::URLButton* temp = _impl_.button_.urlbutton_;
+    _impl_.button_.urlbutton_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -24239,7 +24705,7 @@ inline void TemplateButton::unsafe_arena_set_allocated_urlbutton(::proto::URLBut
   clear_button();
   if (urlbutton) {
     set_has_urlbutton();
-    button_.urlbutton_ = urlbutton;
+    _impl_.button_.urlbutton_ = urlbutton;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.TemplateButton.urlButton)
 }
@@ -24247,9 +24713,9 @@ inline ::proto::URLButton* TemplateButton::_internal_mutable_urlbutton() {
   if (!_internal_has_urlbutton()) {
     clear_button();
     set_has_urlbutton();
-    button_.urlbutton_ = CreateMaybeMessage< ::proto::URLButton >(GetArenaForAllocation());
+    _impl_.button_.urlbutton_ = CreateMaybeMessage< ::proto::URLButton >(GetArenaForAllocation());
   }
-  return button_.urlbutton_;
+  return _impl_.button_.urlbutton_;
 }
 inline ::proto::URLButton* TemplateButton::mutable_urlbutton() {
   ::proto::URLButton* _msg = _internal_mutable_urlbutton();
@@ -24265,12 +24731,12 @@ inline bool TemplateButton::has_callbutton() const {
   return _internal_has_callbutton();
 }
 inline void TemplateButton::set_has_callbutton() {
-  _oneof_case_[0] = kCallButton;
+  _impl_._oneof_case_[0] = kCallButton;
 }
 inline void TemplateButton::clear_callbutton() {
   if (_internal_has_callbutton()) {
     if (GetArenaForAllocation() == nullptr) {
-      delete button_.callbutton_;
+      delete _impl_.button_.callbutton_;
     }
     clear_has_button();
   }
@@ -24279,11 +24745,11 @@ inline ::proto::CallButton* TemplateButton::release_callbutton() {
   // @@protoc_insertion_point(field_release:proto.TemplateButton.callButton)
   if (_internal_has_callbutton()) {
     clear_has_button();
-      ::proto::CallButton* temp = button_.callbutton_;
+    ::proto::CallButton* temp = _impl_.button_.callbutton_;
     if (GetArenaForAllocation() != nullptr) {
       temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
     }
-    button_.callbutton_ = nullptr;
+    _impl_.button_.callbutton_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -24291,7 +24757,7 @@ inline ::proto::CallButton* TemplateButton::release_callbutton() {
 }
 inline const ::proto::CallButton& TemplateButton::_internal_callbutton() const {
   return _internal_has_callbutton()
-      ? *button_.callbutton_
+      ? *_impl_.button_.callbutton_
       : reinterpret_cast< ::proto::CallButton&>(::proto::_CallButton_default_instance_);
 }
 inline const ::proto::CallButton& TemplateButton::callbutton() const {
@@ -24302,8 +24768,8 @@ inline ::proto::CallButton* TemplateButton::unsafe_arena_release_callbutton() {
   // @@protoc_insertion_point(field_unsafe_arena_release:proto.TemplateButton.callButton)
   if (_internal_has_callbutton()) {
     clear_has_button();
-    ::proto::CallButton* temp = button_.callbutton_;
-    button_.callbutton_ = nullptr;
+    ::proto::CallButton* temp = _impl_.button_.callbutton_;
+    _impl_.button_.callbutton_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -24313,7 +24779,7 @@ inline void TemplateButton::unsafe_arena_set_allocated_callbutton(::proto::CallB
   clear_button();
   if (callbutton) {
     set_has_callbutton();
-    button_.callbutton_ = callbutton;
+    _impl_.button_.callbutton_ = callbutton;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.TemplateButton.callButton)
 }
@@ -24321,9 +24787,9 @@ inline ::proto::CallButton* TemplateButton::_internal_mutable_callbutton() {
   if (!_internal_has_callbutton()) {
     clear_button();
     set_has_callbutton();
-    button_.callbutton_ = CreateMaybeMessage< ::proto::CallButton >(GetArenaForAllocation());
+    _impl_.button_.callbutton_ = CreateMaybeMessage< ::proto::CallButton >(GetArenaForAllocation());
   }
-  return button_.callbutton_;
+  return _impl_.button_.callbutton_;
 }
 inline ::proto::CallButton* TemplateButton::mutable_callbutton() {
   ::proto::CallButton* _msg = _internal_mutable_callbutton();
@@ -24335,10 +24801,10 @@ inline bool TemplateButton::has_button() const {
   return button_case() != BUTTON_NOT_SET;
 }
 inline void TemplateButton::clear_has_button() {
-  _oneof_case_[0] = BUTTON_NOT_SET;
+  _impl_._oneof_case_[0] = BUTTON_NOT_SET;
 }
 inline TemplateButton::ButtonCase TemplateButton::button_case() const {
-  return TemplateButton::ButtonCase(_oneof_case_[0]);
+  return TemplateButton::ButtonCase(_impl_._oneof_case_[0]);
 }
 // -------------------------------------------------------------------
 
@@ -24346,26 +24812,26 @@ inline TemplateButton::ButtonCase TemplateButton::button_case() const {
 
 // optional double degreesLatitude = 1;
 inline bool Location::_internal_has_degreeslatitude() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool Location::has_degreeslatitude() const {
   return _internal_has_degreeslatitude();
 }
 inline void Location::clear_degreeslatitude() {
-  degreeslatitude_ = 0;
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.degreeslatitude_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline double Location::_internal_degreeslatitude() const {
-  return degreeslatitude_;
+  return _impl_.degreeslatitude_;
 }
 inline double Location::degreeslatitude() const {
   // @@protoc_insertion_point(field_get:proto.Location.degreesLatitude)
   return _internal_degreeslatitude();
 }
 inline void Location::_internal_set_degreeslatitude(double value) {
-  _has_bits_[0] |= 0x00000002u;
-  degreeslatitude_ = value;
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.degreeslatitude_ = value;
 }
 inline void Location::set_degreeslatitude(double value) {
   _internal_set_degreeslatitude(value);
@@ -24374,26 +24840,26 @@ inline void Location::set_degreeslatitude(double value) {
 
 // optional double degreesLongitude = 2;
 inline bool Location::_internal_has_degreeslongitude() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool Location::has_degreeslongitude() const {
   return _internal_has_degreeslongitude();
 }
 inline void Location::clear_degreeslongitude() {
-  degreeslongitude_ = 0;
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.degreeslongitude_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline double Location::_internal_degreeslongitude() const {
-  return degreeslongitude_;
+  return _impl_.degreeslongitude_;
 }
 inline double Location::degreeslongitude() const {
   // @@protoc_insertion_point(field_get:proto.Location.degreesLongitude)
   return _internal_degreeslongitude();
 }
 inline void Location::_internal_set_degreeslongitude(double value) {
-  _has_bits_[0] |= 0x00000004u;
-  degreeslongitude_ = value;
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.degreeslongitude_ = value;
 }
 inline void Location::set_degreeslongitude(double value) {
   _internal_set_degreeslongitude(value);
@@ -24402,15 +24868,15 @@ inline void Location::set_degreeslongitude(double value) {
 
 // optional string name = 3;
 inline bool Location::_internal_has_name() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool Location::has_name() const {
   return _internal_has_name();
 }
 inline void Location::clear_name() {
-  name_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.name_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& Location::name() const {
   // @@protoc_insertion_point(field_get:proto.Location.name)
@@ -24419,8 +24885,8 @@ inline const std::string& Location::name() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void Location::set_name(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.name_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.Location.name)
 }
 inline std::string* Location::mutable_name() {
@@ -24429,32 +24895,42 @@ inline std::string* Location::mutable_name() {
   return _s;
 }
 inline const std::string& Location::_internal_name() const {
-  return name_.Get();
+  return _impl_.name_.Get();
 }
 inline void Location::_internal_set_name(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.name_.Set(value, GetArenaForAllocation());
 }
 inline std::string* Location::_internal_mutable_name() {
-  _has_bits_[0] |= 0x00000001u;
-  return name_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.name_.Mutable(GetArenaForAllocation());
 }
 inline std::string* Location::release_name() {
   // @@protoc_insertion_point(field_release:proto.Location.name)
   if (!_internal_has_name()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return name_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.name_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.name_.IsDefault()) {
+    _impl_.name_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void Location::set_allocated_name(std::string* name) {
   if (name != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  name_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), name,
-      GetArenaForAllocation());
+  _impl_.name_.SetAllocated(name, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.name_.IsDefault()) {
+    _impl_.name_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.Location.name)
 }
 
@@ -24464,82 +24940,82 @@ inline void Location::set_allocated_name(std::string* name) {
 
 // optional int32 xDeprecated = 1;
 inline bool Point::_internal_has_xdeprecated() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool Point::has_xdeprecated() const {
   return _internal_has_xdeprecated();
 }
 inline void Point::clear_xdeprecated() {
-  xdeprecated_ = 0;
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.xdeprecated_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int32 Point::_internal_xdeprecated() const {
-  return xdeprecated_;
+inline int32_t Point::_internal_xdeprecated() const {
+  return _impl_.xdeprecated_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int32 Point::xdeprecated() const {
+inline int32_t Point::xdeprecated() const {
   // @@protoc_insertion_point(field_get:proto.Point.xDeprecated)
   return _internal_xdeprecated();
 }
-inline void Point::_internal_set_xdeprecated(::PROTOBUF_NAMESPACE_ID::int32 value) {
-  _has_bits_[0] |= 0x00000001u;
-  xdeprecated_ = value;
+inline void Point::_internal_set_xdeprecated(int32_t value) {
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.xdeprecated_ = value;
 }
-inline void Point::set_xdeprecated(::PROTOBUF_NAMESPACE_ID::int32 value) {
+inline void Point::set_xdeprecated(int32_t value) {
   _internal_set_xdeprecated(value);
   // @@protoc_insertion_point(field_set:proto.Point.xDeprecated)
 }
 
 // optional int32 yDeprecated = 2;
 inline bool Point::_internal_has_ydeprecated() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool Point::has_ydeprecated() const {
   return _internal_has_ydeprecated();
 }
 inline void Point::clear_ydeprecated() {
-  ydeprecated_ = 0;
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.ydeprecated_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int32 Point::_internal_ydeprecated() const {
-  return ydeprecated_;
+inline int32_t Point::_internal_ydeprecated() const {
+  return _impl_.ydeprecated_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int32 Point::ydeprecated() const {
+inline int32_t Point::ydeprecated() const {
   // @@protoc_insertion_point(field_get:proto.Point.yDeprecated)
   return _internal_ydeprecated();
 }
-inline void Point::_internal_set_ydeprecated(::PROTOBUF_NAMESPACE_ID::int32 value) {
-  _has_bits_[0] |= 0x00000002u;
-  ydeprecated_ = value;
+inline void Point::_internal_set_ydeprecated(int32_t value) {
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.ydeprecated_ = value;
 }
-inline void Point::set_ydeprecated(::PROTOBUF_NAMESPACE_ID::int32 value) {
+inline void Point::set_ydeprecated(int32_t value) {
   _internal_set_ydeprecated(value);
   // @@protoc_insertion_point(field_set:proto.Point.yDeprecated)
 }
 
 // optional double x = 3;
 inline bool Point::_internal_has_x() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool Point::has_x() const {
   return _internal_has_x();
 }
 inline void Point::clear_x() {
-  x_ = 0;
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.x_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline double Point::_internal_x() const {
-  return x_;
+  return _impl_.x_;
 }
 inline double Point::x() const {
   // @@protoc_insertion_point(field_get:proto.Point.x)
   return _internal_x();
 }
 inline void Point::_internal_set_x(double value) {
-  _has_bits_[0] |= 0x00000004u;
-  x_ = value;
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.x_ = value;
 }
 inline void Point::set_x(double value) {
   _internal_set_x(value);
@@ -24548,26 +25024,26 @@ inline void Point::set_x(double value) {
 
 // optional double y = 4;
 inline bool Point::_internal_has_y() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool Point::has_y() const {
   return _internal_has_y();
 }
 inline void Point::clear_y() {
-  y_ = 0;
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.y_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline double Point::_internal_y() const {
-  return y_;
+  return _impl_.y_;
 }
 inline double Point::y() const {
   // @@protoc_insertion_point(field_get:proto.Point.y)
   return _internal_y();
 }
 inline void Point::_internal_set_y(double value) {
-  _has_bits_[0] |= 0x00000008u;
-  y_ = value;
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.y_ = value;
 }
 inline void Point::set_y(double value) {
   _internal_set_y(value);
@@ -24580,32 +25056,32 @@ inline void Point::set_y(double value) {
 
 // repeated .proto.Point polygonVertices = 1;
 inline int InteractiveAnnotation::_internal_polygonvertices_size() const {
-  return polygonvertices_.size();
+  return _impl_.polygonvertices_.size();
 }
 inline int InteractiveAnnotation::polygonvertices_size() const {
   return _internal_polygonvertices_size();
 }
 inline void InteractiveAnnotation::clear_polygonvertices() {
-  polygonvertices_.Clear();
+  _impl_.polygonvertices_.Clear();
 }
 inline ::proto::Point* InteractiveAnnotation::mutable_polygonvertices(int index) {
   // @@protoc_insertion_point(field_mutable:proto.InteractiveAnnotation.polygonVertices)
-  return polygonvertices_.Mutable(index);
+  return _impl_.polygonvertices_.Mutable(index);
 }
 inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::Point >*
 InteractiveAnnotation::mutable_polygonvertices() {
   // @@protoc_insertion_point(field_mutable_list:proto.InteractiveAnnotation.polygonVertices)
-  return &polygonvertices_;
+  return &_impl_.polygonvertices_;
 }
 inline const ::proto::Point& InteractiveAnnotation::_internal_polygonvertices(int index) const {
-  return polygonvertices_.Get(index);
+  return _impl_.polygonvertices_.Get(index);
 }
 inline const ::proto::Point& InteractiveAnnotation::polygonvertices(int index) const {
   // @@protoc_insertion_point(field_get:proto.InteractiveAnnotation.polygonVertices)
   return _internal_polygonvertices(index);
 }
 inline ::proto::Point* InteractiveAnnotation::_internal_add_polygonvertices() {
-  return polygonvertices_.Add();
+  return _impl_.polygonvertices_.Add();
 }
 inline ::proto::Point* InteractiveAnnotation::add_polygonvertices() {
   ::proto::Point* _add = _internal_add_polygonvertices();
@@ -24615,7 +25091,7 @@ inline ::proto::Point* InteractiveAnnotation::add_polygonvertices() {
 inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::Point >&
 InteractiveAnnotation::polygonvertices() const {
   // @@protoc_insertion_point(field_list:proto.InteractiveAnnotation.polygonVertices)
-  return polygonvertices_;
+  return _impl_.polygonvertices_;
 }
 
 // .proto.Location location = 2;
@@ -24626,12 +25102,12 @@ inline bool InteractiveAnnotation::has_location() const {
   return _internal_has_location();
 }
 inline void InteractiveAnnotation::set_has_location() {
-  _oneof_case_[0] = kLocation;
+  _impl_._oneof_case_[0] = kLocation;
 }
 inline void InteractiveAnnotation::clear_location() {
   if (_internal_has_location()) {
     if (GetArenaForAllocation() == nullptr) {
-      delete action_.location_;
+      delete _impl_.action_.location_;
     }
     clear_has_action();
   }
@@ -24640,11 +25116,11 @@ inline ::proto::Location* InteractiveAnnotation::release_location() {
   // @@protoc_insertion_point(field_release:proto.InteractiveAnnotation.location)
   if (_internal_has_location()) {
     clear_has_action();
-      ::proto::Location* temp = action_.location_;
+    ::proto::Location* temp = _impl_.action_.location_;
     if (GetArenaForAllocation() != nullptr) {
       temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
     }
-    action_.location_ = nullptr;
+    _impl_.action_.location_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -24652,7 +25128,7 @@ inline ::proto::Location* InteractiveAnnotation::release_location() {
 }
 inline const ::proto::Location& InteractiveAnnotation::_internal_location() const {
   return _internal_has_location()
-      ? *action_.location_
+      ? *_impl_.action_.location_
       : reinterpret_cast< ::proto::Location&>(::proto::_Location_default_instance_);
 }
 inline const ::proto::Location& InteractiveAnnotation::location() const {
@@ -24663,8 +25139,8 @@ inline ::proto::Location* InteractiveAnnotation::unsafe_arena_release_location()
   // @@protoc_insertion_point(field_unsafe_arena_release:proto.InteractiveAnnotation.location)
   if (_internal_has_location()) {
     clear_has_action();
-    ::proto::Location* temp = action_.location_;
-    action_.location_ = nullptr;
+    ::proto::Location* temp = _impl_.action_.location_;
+    _impl_.action_.location_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -24674,7 +25150,7 @@ inline void InteractiveAnnotation::unsafe_arena_set_allocated_location(::proto::
   clear_action();
   if (location) {
     set_has_location();
-    action_.location_ = location;
+    _impl_.action_.location_ = location;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.InteractiveAnnotation.location)
 }
@@ -24682,9 +25158,9 @@ inline ::proto::Location* InteractiveAnnotation::_internal_mutable_location() {
   if (!_internal_has_location()) {
     clear_action();
     set_has_location();
-    action_.location_ = CreateMaybeMessage< ::proto::Location >(GetArenaForAllocation());
+    _impl_.action_.location_ = CreateMaybeMessage< ::proto::Location >(GetArenaForAllocation());
   }
-  return action_.location_;
+  return _impl_.action_.location_;
 }
 inline ::proto::Location* InteractiveAnnotation::mutable_location() {
   ::proto::Location* _msg = _internal_mutable_location();
@@ -24696,10 +25172,10 @@ inline bool InteractiveAnnotation::has_action() const {
   return action_case() != ACTION_NOT_SET;
 }
 inline void InteractiveAnnotation::clear_has_action() {
-  _oneof_case_[0] = ACTION_NOT_SET;
+  _impl_._oneof_case_[0] = ACTION_NOT_SET;
 }
 inline InteractiveAnnotation::ActionCase InteractiveAnnotation::action_case() const {
-  return InteractiveAnnotation::ActionCase(_oneof_case_[0]);
+  return InteractiveAnnotation::ActionCase(_impl_._oneof_case_[0]);
 }
 // -------------------------------------------------------------------
 
@@ -24707,15 +25183,15 @@ inline InteractiveAnnotation::ActionCase InteractiveAnnotation::action_case() co
 
 // optional bytes senderKeyHash = 1;
 inline bool DeviceListMetadata::_internal_has_senderkeyhash() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool DeviceListMetadata::has_senderkeyhash() const {
   return _internal_has_senderkeyhash();
 }
 inline void DeviceListMetadata::clear_senderkeyhash() {
-  senderkeyhash_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.senderkeyhash_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& DeviceListMetadata::senderkeyhash() const {
   // @@protoc_insertion_point(field_get:proto.DeviceListMetadata.senderKeyHash)
@@ -24724,8 +25200,8 @@ inline const std::string& DeviceListMetadata::senderkeyhash() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void DeviceListMetadata::set_senderkeyhash(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- senderkeyhash_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.senderkeyhash_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.DeviceListMetadata.senderKeyHash)
 }
 inline std::string* DeviceListMetadata::mutable_senderkeyhash() {
@@ -24734,74 +25210,84 @@ inline std::string* DeviceListMetadata::mutable_senderkeyhash() {
   return _s;
 }
 inline const std::string& DeviceListMetadata::_internal_senderkeyhash() const {
-  return senderkeyhash_.Get();
+  return _impl_.senderkeyhash_.Get();
 }
 inline void DeviceListMetadata::_internal_set_senderkeyhash(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  senderkeyhash_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.senderkeyhash_.Set(value, GetArenaForAllocation());
 }
 inline std::string* DeviceListMetadata::_internal_mutable_senderkeyhash() {
-  _has_bits_[0] |= 0x00000001u;
-  return senderkeyhash_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.senderkeyhash_.Mutable(GetArenaForAllocation());
 }
 inline std::string* DeviceListMetadata::release_senderkeyhash() {
   // @@protoc_insertion_point(field_release:proto.DeviceListMetadata.senderKeyHash)
   if (!_internal_has_senderkeyhash()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return senderkeyhash_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.senderkeyhash_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.senderkeyhash_.IsDefault()) {
+    _impl_.senderkeyhash_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void DeviceListMetadata::set_allocated_senderkeyhash(std::string* senderkeyhash) {
   if (senderkeyhash != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  senderkeyhash_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), senderkeyhash,
-      GetArenaForAllocation());
+  _impl_.senderkeyhash_.SetAllocated(senderkeyhash, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.senderkeyhash_.IsDefault()) {
+    _impl_.senderkeyhash_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.DeviceListMetadata.senderKeyHash)
 }
 
 // optional uint64 senderTimestamp = 2;
 inline bool DeviceListMetadata::_internal_has_sendertimestamp() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool DeviceListMetadata::has_sendertimestamp() const {
   return _internal_has_sendertimestamp();
 }
 inline void DeviceListMetadata::clear_sendertimestamp() {
-  sendertimestamp_ = uint64_t{0u};
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.sendertimestamp_ = uint64_t{0u};
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 DeviceListMetadata::_internal_sendertimestamp() const {
-  return sendertimestamp_;
+inline uint64_t DeviceListMetadata::_internal_sendertimestamp() const {
+  return _impl_.sendertimestamp_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 DeviceListMetadata::sendertimestamp() const {
+inline uint64_t DeviceListMetadata::sendertimestamp() const {
   // @@protoc_insertion_point(field_get:proto.DeviceListMetadata.senderTimestamp)
   return _internal_sendertimestamp();
 }
-inline void DeviceListMetadata::_internal_set_sendertimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value) {
-  _has_bits_[0] |= 0x00000004u;
-  sendertimestamp_ = value;
+inline void DeviceListMetadata::_internal_set_sendertimestamp(uint64_t value) {
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.sendertimestamp_ = value;
 }
-inline void DeviceListMetadata::set_sendertimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value) {
+inline void DeviceListMetadata::set_sendertimestamp(uint64_t value) {
   _internal_set_sendertimestamp(value);
   // @@protoc_insertion_point(field_set:proto.DeviceListMetadata.senderTimestamp)
 }
 
 // optional bytes recipientKeyHash = 8;
 inline bool DeviceListMetadata::_internal_has_recipientkeyhash() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool DeviceListMetadata::has_recipientkeyhash() const {
   return _internal_has_recipientkeyhash();
 }
 inline void DeviceListMetadata::clear_recipientkeyhash() {
-  recipientkeyhash_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.recipientkeyhash_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& DeviceListMetadata::recipientkeyhash() const {
   // @@protoc_insertion_point(field_get:proto.DeviceListMetadata.recipientKeyHash)
@@ -24810,8 +25296,8 @@ inline const std::string& DeviceListMetadata::recipientkeyhash() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void DeviceListMetadata::set_recipientkeyhash(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- recipientkeyhash_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.recipientkeyhash_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.DeviceListMetadata.recipientKeyHash)
 }
 inline std::string* DeviceListMetadata::mutable_recipientkeyhash() {
@@ -24820,59 +25306,69 @@ inline std::string* DeviceListMetadata::mutable_recipientkeyhash() {
   return _s;
 }
 inline const std::string& DeviceListMetadata::_internal_recipientkeyhash() const {
-  return recipientkeyhash_.Get();
+  return _impl_.recipientkeyhash_.Get();
 }
 inline void DeviceListMetadata::_internal_set_recipientkeyhash(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  recipientkeyhash_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.recipientkeyhash_.Set(value, GetArenaForAllocation());
 }
 inline std::string* DeviceListMetadata::_internal_mutable_recipientkeyhash() {
-  _has_bits_[0] |= 0x00000002u;
-  return recipientkeyhash_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.recipientkeyhash_.Mutable(GetArenaForAllocation());
 }
 inline std::string* DeviceListMetadata::release_recipientkeyhash() {
   // @@protoc_insertion_point(field_release:proto.DeviceListMetadata.recipientKeyHash)
   if (!_internal_has_recipientkeyhash()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return recipientkeyhash_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.recipientkeyhash_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.recipientkeyhash_.IsDefault()) {
+    _impl_.recipientkeyhash_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void DeviceListMetadata::set_allocated_recipientkeyhash(std::string* recipientkeyhash) {
   if (recipientkeyhash != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  recipientkeyhash_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), recipientkeyhash,
-      GetArenaForAllocation());
+  _impl_.recipientkeyhash_.SetAllocated(recipientkeyhash, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.recipientkeyhash_.IsDefault()) {
+    _impl_.recipientkeyhash_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.DeviceListMetadata.recipientKeyHash)
 }
 
 // optional uint64 recipientTimestamp = 9;
 inline bool DeviceListMetadata::_internal_has_recipienttimestamp() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool DeviceListMetadata::has_recipienttimestamp() const {
   return _internal_has_recipienttimestamp();
 }
 inline void DeviceListMetadata::clear_recipienttimestamp() {
-  recipienttimestamp_ = uint64_t{0u};
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.recipienttimestamp_ = uint64_t{0u};
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 DeviceListMetadata::_internal_recipienttimestamp() const {
-  return recipienttimestamp_;
+inline uint64_t DeviceListMetadata::_internal_recipienttimestamp() const {
+  return _impl_.recipienttimestamp_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 DeviceListMetadata::recipienttimestamp() const {
+inline uint64_t DeviceListMetadata::recipienttimestamp() const {
   // @@protoc_insertion_point(field_get:proto.DeviceListMetadata.recipientTimestamp)
   return _internal_recipienttimestamp();
 }
-inline void DeviceListMetadata::_internal_set_recipienttimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value) {
-  _has_bits_[0] |= 0x00000008u;
-  recipienttimestamp_ = value;
+inline void DeviceListMetadata::_internal_set_recipienttimestamp(uint64_t value) {
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.recipienttimestamp_ = value;
 }
-inline void DeviceListMetadata::set_recipienttimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value) {
+inline void DeviceListMetadata::set_recipienttimestamp(uint64_t value) {
   _internal_set_recipienttimestamp(value);
   // @@protoc_insertion_point(field_set:proto.DeviceListMetadata.recipientTimestamp)
 }
@@ -24883,19 +25379,19 @@ inline void DeviceListMetadata::set_recipienttimestamp(::PROTOBUF_NAMESPACE_ID::
 
 // optional .proto.DeviceListMetadata deviceListMetadata = 1;
 inline bool MessageContextInfo::_internal_has_devicelistmetadata() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || devicelistmetadata_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.devicelistmetadata_ != nullptr);
   return value;
 }
 inline bool MessageContextInfo::has_devicelistmetadata() const {
   return _internal_has_devicelistmetadata();
 }
 inline void MessageContextInfo::clear_devicelistmetadata() {
-  if (devicelistmetadata_ != nullptr) devicelistmetadata_->Clear();
-  _has_bits_[0] &= ~0x00000001u;
+  if (_impl_.devicelistmetadata_ != nullptr) _impl_.devicelistmetadata_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const ::proto::DeviceListMetadata& MessageContextInfo::_internal_devicelistmetadata() const {
-  const ::proto::DeviceListMetadata* p = devicelistmetadata_;
+  const ::proto::DeviceListMetadata* p = _impl_.devicelistmetadata_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::DeviceListMetadata&>(
       ::proto::_DeviceListMetadata_default_instance_);
 }
@@ -24906,20 +25402,20 @@ inline const ::proto::DeviceListMetadata& MessageContextInfo::devicelistmetadata
 inline void MessageContextInfo::unsafe_arena_set_allocated_devicelistmetadata(
     ::proto::DeviceListMetadata* devicelistmetadata) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(devicelistmetadata_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.devicelistmetadata_);
   }
-  devicelistmetadata_ = devicelistmetadata;
+  _impl_.devicelistmetadata_ = devicelistmetadata;
   if (devicelistmetadata) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.MessageContextInfo.deviceListMetadata)
 }
 inline ::proto::DeviceListMetadata* MessageContextInfo::release_devicelistmetadata() {
-  _has_bits_[0] &= ~0x00000001u;
-  ::proto::DeviceListMetadata* temp = devicelistmetadata_;
-  devicelistmetadata_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  ::proto::DeviceListMetadata* temp = _impl_.devicelistmetadata_;
+  _impl_.devicelistmetadata_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -24933,18 +25429,18 @@ inline ::proto::DeviceListMetadata* MessageContextInfo::release_devicelistmetada
 }
 inline ::proto::DeviceListMetadata* MessageContextInfo::unsafe_arena_release_devicelistmetadata() {
   // @@protoc_insertion_point(field_release:proto.MessageContextInfo.deviceListMetadata)
-  _has_bits_[0] &= ~0x00000001u;
-  ::proto::DeviceListMetadata* temp = devicelistmetadata_;
-  devicelistmetadata_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  ::proto::DeviceListMetadata* temp = _impl_.devicelistmetadata_;
+  _impl_.devicelistmetadata_ = nullptr;
   return temp;
 }
 inline ::proto::DeviceListMetadata* MessageContextInfo::_internal_mutable_devicelistmetadata() {
-  _has_bits_[0] |= 0x00000001u;
-  if (devicelistmetadata_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000001u;
+  if (_impl_.devicelistmetadata_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::DeviceListMetadata>(GetArenaForAllocation());
-    devicelistmetadata_ = p;
+    _impl_.devicelistmetadata_ = p;
   }
-  return devicelistmetadata_;
+  return _impl_.devicelistmetadata_;
 }
 inline ::proto::DeviceListMetadata* MessageContextInfo::mutable_devicelistmetadata() {
   ::proto::DeviceListMetadata* _msg = _internal_mutable_devicelistmetadata();
@@ -24954,20 +25450,20 @@ inline ::proto::DeviceListMetadata* MessageContextInfo::mutable_devicelistmetada
 inline void MessageContextInfo::set_allocated_devicelistmetadata(::proto::DeviceListMetadata* devicelistmetadata) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete devicelistmetadata_;
+    delete _impl_.devicelistmetadata_;
   }
   if (devicelistmetadata) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::DeviceListMetadata>::GetOwningArena(devicelistmetadata);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(devicelistmetadata);
     if (message_arena != submessage_arena) {
       devicelistmetadata = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, devicelistmetadata, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  devicelistmetadata_ = devicelistmetadata;
+  _impl_.devicelistmetadata_ = devicelistmetadata;
   // @@protoc_insertion_point(field_set_allocated:proto.MessageContextInfo.deviceListMetadata)
 }
 
@@ -24977,15 +25473,15 @@ inline void MessageContextInfo::set_allocated_devicelistmetadata(::proto::Device
 
 // optional string advertiserName = 1;
 inline bool AdReplyInfo::_internal_has_advertisername() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool AdReplyInfo::has_advertisername() const {
   return _internal_has_advertisername();
 }
 inline void AdReplyInfo::clear_advertisername() {
-  advertisername_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.advertisername_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& AdReplyInfo::advertisername() const {
   // @@protoc_insertion_point(field_get:proto.AdReplyInfo.advertiserName)
@@ -24994,8 +25490,8 @@ inline const std::string& AdReplyInfo::advertisername() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void AdReplyInfo::set_advertisername(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- advertisername_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.advertisername_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.AdReplyInfo.advertiserName)
 }
 inline std::string* AdReplyInfo::mutable_advertisername() {
@@ -25004,49 +25500,59 @@ inline std::string* AdReplyInfo::mutable_advertisername() {
   return _s;
 }
 inline const std::string& AdReplyInfo::_internal_advertisername() const {
-  return advertisername_.Get();
+  return _impl_.advertisername_.Get();
 }
 inline void AdReplyInfo::_internal_set_advertisername(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  advertisername_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.advertisername_.Set(value, GetArenaForAllocation());
 }
 inline std::string* AdReplyInfo::_internal_mutable_advertisername() {
-  _has_bits_[0] |= 0x00000001u;
-  return advertisername_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.advertisername_.Mutable(GetArenaForAllocation());
 }
 inline std::string* AdReplyInfo::release_advertisername() {
   // @@protoc_insertion_point(field_release:proto.AdReplyInfo.advertiserName)
   if (!_internal_has_advertisername()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return advertisername_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.advertisername_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.advertisername_.IsDefault()) {
+    _impl_.advertisername_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void AdReplyInfo::set_allocated_advertisername(std::string* advertisername) {
   if (advertisername != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  advertisername_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), advertisername,
-      GetArenaForAllocation());
+  _impl_.advertisername_.SetAllocated(advertisername, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.advertisername_.IsDefault()) {
+    _impl_.advertisername_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.AdReplyInfo.advertiserName)
 }
 
 // optional .proto.AdReplyInfo.AdReplyInfoMediaType mediaType = 2;
 inline bool AdReplyInfo::_internal_has_mediatype() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool AdReplyInfo::has_mediatype() const {
   return _internal_has_mediatype();
 }
 inline void AdReplyInfo::clear_mediatype() {
-  mediatype_ = 0;
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.mediatype_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline ::proto::AdReplyInfo_AdReplyInfoMediaType AdReplyInfo::_internal_mediatype() const {
-  return static_cast< ::proto::AdReplyInfo_AdReplyInfoMediaType >(mediatype_);
+  return static_cast< ::proto::AdReplyInfo_AdReplyInfoMediaType >(_impl_.mediatype_);
 }
 inline ::proto::AdReplyInfo_AdReplyInfoMediaType AdReplyInfo::mediatype() const {
   // @@protoc_insertion_point(field_get:proto.AdReplyInfo.mediaType)
@@ -25054,8 +25560,8 @@ inline ::proto::AdReplyInfo_AdReplyInfoMediaType AdReplyInfo::mediatype() const
 }
 inline void AdReplyInfo::_internal_set_mediatype(::proto::AdReplyInfo_AdReplyInfoMediaType value) {
   assert(::proto::AdReplyInfo_AdReplyInfoMediaType_IsValid(value));
-  _has_bits_[0] |= 0x00000008u;
-  mediatype_ = value;
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.mediatype_ = value;
 }
 inline void AdReplyInfo::set_mediatype(::proto::AdReplyInfo_AdReplyInfoMediaType value) {
   _internal_set_mediatype(value);
@@ -25064,15 +25570,15 @@ inline void AdReplyInfo::set_mediatype(::proto::AdReplyInfo_AdReplyInfoMediaType
 
 // optional bytes jpegThumbnail = 16;
 inline bool AdReplyInfo::_internal_has_jpegthumbnail() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool AdReplyInfo::has_jpegthumbnail() const {
   return _internal_has_jpegthumbnail();
 }
 inline void AdReplyInfo::clear_jpegthumbnail() {
-  jpegthumbnail_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.jpegthumbnail_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& AdReplyInfo::jpegthumbnail() const {
   // @@protoc_insertion_point(field_get:proto.AdReplyInfo.jpegThumbnail)
@@ -25081,8 +25587,8 @@ inline const std::string& AdReplyInfo::jpegthumbnail() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void AdReplyInfo::set_jpegthumbnail(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- jpegthumbnail_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.jpegthumbnail_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.AdReplyInfo.jpegThumbnail)
 }
 inline std::string* AdReplyInfo::mutable_jpegthumbnail() {
@@ -25091,46 +25597,56 @@ inline std::string* AdReplyInfo::mutable_jpegthumbnail() {
   return _s;
 }
 inline const std::string& AdReplyInfo::_internal_jpegthumbnail() const {
-  return jpegthumbnail_.Get();
+  return _impl_.jpegthumbnail_.Get();
 }
 inline void AdReplyInfo::_internal_set_jpegthumbnail(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  jpegthumbnail_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.jpegthumbnail_.Set(value, GetArenaForAllocation());
 }
 inline std::string* AdReplyInfo::_internal_mutable_jpegthumbnail() {
-  _has_bits_[0] |= 0x00000002u;
-  return jpegthumbnail_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.jpegthumbnail_.Mutable(GetArenaForAllocation());
 }
 inline std::string* AdReplyInfo::release_jpegthumbnail() {
   // @@protoc_insertion_point(field_release:proto.AdReplyInfo.jpegThumbnail)
   if (!_internal_has_jpegthumbnail()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return jpegthumbnail_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.jpegthumbnail_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.jpegthumbnail_.IsDefault()) {
+    _impl_.jpegthumbnail_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void AdReplyInfo::set_allocated_jpegthumbnail(std::string* jpegthumbnail) {
   if (jpegthumbnail != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  jpegthumbnail_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), jpegthumbnail,
-      GetArenaForAllocation());
+  _impl_.jpegthumbnail_.SetAllocated(jpegthumbnail, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.jpegthumbnail_.IsDefault()) {
+    _impl_.jpegthumbnail_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.AdReplyInfo.jpegThumbnail)
 }
 
 // optional string caption = 17;
 inline bool AdReplyInfo::_internal_has_caption() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool AdReplyInfo::has_caption() const {
   return _internal_has_caption();
 }
 inline void AdReplyInfo::clear_caption() {
-  caption_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.caption_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const std::string& AdReplyInfo::caption() const {
   // @@protoc_insertion_point(field_get:proto.AdReplyInfo.caption)
@@ -25139,8 +25655,8 @@ inline const std::string& AdReplyInfo::caption() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void AdReplyInfo::set_caption(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000004u;
- caption_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000004u;
+ _impl_.caption_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.AdReplyInfo.caption)
 }
 inline std::string* AdReplyInfo::mutable_caption() {
@@ -25149,32 +25665,42 @@ inline std::string* AdReplyInfo::mutable_caption() {
   return _s;
 }
 inline const std::string& AdReplyInfo::_internal_caption() const {
-  return caption_.Get();
+  return _impl_.caption_.Get();
 }
 inline void AdReplyInfo::_internal_set_caption(const std::string& value) {
-  _has_bits_[0] |= 0x00000004u;
-  caption_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.caption_.Set(value, GetArenaForAllocation());
 }
 inline std::string* AdReplyInfo::_internal_mutable_caption() {
-  _has_bits_[0] |= 0x00000004u;
-  return caption_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  return _impl_.caption_.Mutable(GetArenaForAllocation());
 }
 inline std::string* AdReplyInfo::release_caption() {
   // @@protoc_insertion_point(field_release:proto.AdReplyInfo.caption)
   if (!_internal_has_caption()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000004u;
-  return caption_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  auto* p = _impl_.caption_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.caption_.IsDefault()) {
+    _impl_.caption_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void AdReplyInfo::set_allocated_caption(std::string* caption) {
   if (caption != nullptr) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
-  caption_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), caption,
-      GetArenaForAllocation());
+  _impl_.caption_.SetAllocated(caption, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.caption_.IsDefault()) {
+    _impl_.caption_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.AdReplyInfo.caption)
 }
 
@@ -25184,15 +25710,15 @@ inline void AdReplyInfo::set_allocated_caption(std::string* caption) {
 
 // optional string title = 1;
 inline bool ExternalAdReplyInfo::_internal_has_title() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool ExternalAdReplyInfo::has_title() const {
   return _internal_has_title();
 }
 inline void ExternalAdReplyInfo::clear_title() {
-  title_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.title_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& ExternalAdReplyInfo::title() const {
   // @@protoc_insertion_point(field_get:proto.ExternalAdReplyInfo.title)
@@ -25201,8 +25727,8 @@ inline const std::string& ExternalAdReplyInfo::title() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ExternalAdReplyInfo::set_title(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- title_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.title_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ExternalAdReplyInfo.title)
 }
 inline std::string* ExternalAdReplyInfo::mutable_title() {
@@ -25211,46 +25737,56 @@ inline std::string* ExternalAdReplyInfo::mutable_title() {
   return _s;
 }
 inline const std::string& ExternalAdReplyInfo::_internal_title() const {
-  return title_.Get();
+  return _impl_.title_.Get();
 }
 inline void ExternalAdReplyInfo::_internal_set_title(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  title_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.title_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ExternalAdReplyInfo::_internal_mutable_title() {
-  _has_bits_[0] |= 0x00000001u;
-  return title_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.title_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ExternalAdReplyInfo::release_title() {
   // @@protoc_insertion_point(field_release:proto.ExternalAdReplyInfo.title)
   if (!_internal_has_title()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return title_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.title_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.title_.IsDefault()) {
+    _impl_.title_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ExternalAdReplyInfo::set_allocated_title(std::string* title) {
   if (title != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  title_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), title,
-      GetArenaForAllocation());
+  _impl_.title_.SetAllocated(title, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.title_.IsDefault()) {
+    _impl_.title_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ExternalAdReplyInfo.title)
 }
 
 // optional string body = 2;
 inline bool ExternalAdReplyInfo::_internal_has_body() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool ExternalAdReplyInfo::has_body() const {
   return _internal_has_body();
 }
 inline void ExternalAdReplyInfo::clear_body() {
-  body_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.body_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& ExternalAdReplyInfo::body() const {
   // @@protoc_insertion_point(field_get:proto.ExternalAdReplyInfo.body)
@@ -25259,8 +25795,8 @@ inline const std::string& ExternalAdReplyInfo::body() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ExternalAdReplyInfo::set_body(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- body_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.body_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ExternalAdReplyInfo.body)
 }
 inline std::string* ExternalAdReplyInfo::mutable_body() {
@@ -25269,49 +25805,59 @@ inline std::string* ExternalAdReplyInfo::mutable_body() {
   return _s;
 }
 inline const std::string& ExternalAdReplyInfo::_internal_body() const {
-  return body_.Get();
+  return _impl_.body_.Get();
 }
 inline void ExternalAdReplyInfo::_internal_set_body(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  body_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.body_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ExternalAdReplyInfo::_internal_mutable_body() {
-  _has_bits_[0] |= 0x00000002u;
-  return body_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.body_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ExternalAdReplyInfo::release_body() {
   // @@protoc_insertion_point(field_release:proto.ExternalAdReplyInfo.body)
   if (!_internal_has_body()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return body_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.body_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.body_.IsDefault()) {
+    _impl_.body_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ExternalAdReplyInfo::set_allocated_body(std::string* body) {
   if (body != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
+  }
+  _impl_.body_.SetAllocated(body, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.body_.IsDefault()) {
+    _impl_.body_.Set("", GetArenaForAllocation());
   }
-  body_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), body,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ExternalAdReplyInfo.body)
 }
 
 // optional .proto.ExternalAdReplyInfo.ExternalAdReplyInfoMediaType mediaType = 3;
 inline bool ExternalAdReplyInfo::_internal_has_mediatype() const {
-  bool value = (_has_bits_[0] & 0x00000100u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000100u) != 0;
   return value;
 }
 inline bool ExternalAdReplyInfo::has_mediatype() const {
   return _internal_has_mediatype();
 }
 inline void ExternalAdReplyInfo::clear_mediatype() {
-  mediatype_ = 0;
-  _has_bits_[0] &= ~0x00000100u;
+  _impl_.mediatype_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000100u;
 }
 inline ::proto::ExternalAdReplyInfo_ExternalAdReplyInfoMediaType ExternalAdReplyInfo::_internal_mediatype() const {
-  return static_cast< ::proto::ExternalAdReplyInfo_ExternalAdReplyInfoMediaType >(mediatype_);
+  return static_cast< ::proto::ExternalAdReplyInfo_ExternalAdReplyInfoMediaType >(_impl_.mediatype_);
 }
 inline ::proto::ExternalAdReplyInfo_ExternalAdReplyInfoMediaType ExternalAdReplyInfo::mediatype() const {
   // @@protoc_insertion_point(field_get:proto.ExternalAdReplyInfo.mediaType)
@@ -25319,8 +25865,8 @@ inline ::proto::ExternalAdReplyInfo_ExternalAdReplyInfoMediaType ExternalAdReply
 }
 inline void ExternalAdReplyInfo::_internal_set_mediatype(::proto::ExternalAdReplyInfo_ExternalAdReplyInfoMediaType value) {
   assert(::proto::ExternalAdReplyInfo_ExternalAdReplyInfoMediaType_IsValid(value));
-  _has_bits_[0] |= 0x00000100u;
-  mediatype_ = value;
+  _impl_._has_bits_[0] |= 0x00000100u;
+  _impl_.mediatype_ = value;
 }
 inline void ExternalAdReplyInfo::set_mediatype(::proto::ExternalAdReplyInfo_ExternalAdReplyInfoMediaType value) {
   _internal_set_mediatype(value);
@@ -25329,15 +25875,15 @@ inline void ExternalAdReplyInfo::set_mediatype(::proto::ExternalAdReplyInfo_Exte
 
 // optional string thumbnailUrl = 4;
 inline bool ExternalAdReplyInfo::_internal_has_thumbnailurl() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool ExternalAdReplyInfo::has_thumbnailurl() const {
   return _internal_has_thumbnailurl();
 }
 inline void ExternalAdReplyInfo::clear_thumbnailurl() {
-  thumbnailurl_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.thumbnailurl_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const std::string& ExternalAdReplyInfo::thumbnailurl() const {
   // @@protoc_insertion_point(field_get:proto.ExternalAdReplyInfo.thumbnailUrl)
@@ -25346,8 +25892,8 @@ inline const std::string& ExternalAdReplyInfo::thumbnailurl() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ExternalAdReplyInfo::set_thumbnailurl(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000004u;
- thumbnailurl_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000004u;
+ _impl_.thumbnailurl_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ExternalAdReplyInfo.thumbnailUrl)
 }
 inline std::string* ExternalAdReplyInfo::mutable_thumbnailurl() {
@@ -25356,46 +25902,56 @@ inline std::string* ExternalAdReplyInfo::mutable_thumbnailurl() {
   return _s;
 }
 inline const std::string& ExternalAdReplyInfo::_internal_thumbnailurl() const {
-  return thumbnailurl_.Get();
+  return _impl_.thumbnailurl_.Get();
 }
 inline void ExternalAdReplyInfo::_internal_set_thumbnailurl(const std::string& value) {
-  _has_bits_[0] |= 0x00000004u;
-  thumbnailurl_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.thumbnailurl_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ExternalAdReplyInfo::_internal_mutable_thumbnailurl() {
-  _has_bits_[0] |= 0x00000004u;
-  return thumbnailurl_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  return _impl_.thumbnailurl_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ExternalAdReplyInfo::release_thumbnailurl() {
   // @@protoc_insertion_point(field_release:proto.ExternalAdReplyInfo.thumbnailUrl)
   if (!_internal_has_thumbnailurl()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000004u;
-  return thumbnailurl_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  auto* p = _impl_.thumbnailurl_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.thumbnailurl_.IsDefault()) {
+    _impl_.thumbnailurl_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ExternalAdReplyInfo::set_allocated_thumbnailurl(std::string* thumbnailurl) {
   if (thumbnailurl != nullptr) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
+  }
+  _impl_.thumbnailurl_.SetAllocated(thumbnailurl, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.thumbnailurl_.IsDefault()) {
+    _impl_.thumbnailurl_.Set("", GetArenaForAllocation());
   }
-  thumbnailurl_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), thumbnailurl,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ExternalAdReplyInfo.thumbnailUrl)
 }
 
 // optional string mediaUrl = 5;
 inline bool ExternalAdReplyInfo::_internal_has_mediaurl() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool ExternalAdReplyInfo::has_mediaurl() const {
   return _internal_has_mediaurl();
 }
 inline void ExternalAdReplyInfo::clear_mediaurl() {
-  mediaurl_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.mediaurl_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline const std::string& ExternalAdReplyInfo::mediaurl() const {
   // @@protoc_insertion_point(field_get:proto.ExternalAdReplyInfo.mediaUrl)
@@ -25404,8 +25960,8 @@ inline const std::string& ExternalAdReplyInfo::mediaurl() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ExternalAdReplyInfo::set_mediaurl(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000008u;
- mediaurl_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000008u;
+ _impl_.mediaurl_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ExternalAdReplyInfo.mediaUrl)
 }
 inline std::string* ExternalAdReplyInfo::mutable_mediaurl() {
@@ -25414,46 +25970,56 @@ inline std::string* ExternalAdReplyInfo::mutable_mediaurl() {
   return _s;
 }
 inline const std::string& ExternalAdReplyInfo::_internal_mediaurl() const {
-  return mediaurl_.Get();
+  return _impl_.mediaurl_.Get();
 }
 inline void ExternalAdReplyInfo::_internal_set_mediaurl(const std::string& value) {
-  _has_bits_[0] |= 0x00000008u;
-  mediaurl_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.mediaurl_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ExternalAdReplyInfo::_internal_mutable_mediaurl() {
-  _has_bits_[0] |= 0x00000008u;
-  return mediaurl_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  return _impl_.mediaurl_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ExternalAdReplyInfo::release_mediaurl() {
   // @@protoc_insertion_point(field_release:proto.ExternalAdReplyInfo.mediaUrl)
   if (!_internal_has_mediaurl()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000008u;
-  return mediaurl_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  auto* p = _impl_.mediaurl_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.mediaurl_.IsDefault()) {
+    _impl_.mediaurl_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ExternalAdReplyInfo::set_allocated_mediaurl(std::string* mediaurl) {
   if (mediaurl != nullptr) {
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
+  }
+  _impl_.mediaurl_.SetAllocated(mediaurl, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.mediaurl_.IsDefault()) {
+    _impl_.mediaurl_.Set("", GetArenaForAllocation());
   }
-  mediaurl_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), mediaurl,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ExternalAdReplyInfo.mediaUrl)
 }
 
 // optional bytes thumbnail = 6;
 inline bool ExternalAdReplyInfo::_internal_has_thumbnail() const {
-  bool value = (_has_bits_[0] & 0x00000010u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
   return value;
 }
 inline bool ExternalAdReplyInfo::has_thumbnail() const {
   return _internal_has_thumbnail();
 }
 inline void ExternalAdReplyInfo::clear_thumbnail() {
-  thumbnail_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000010u;
+  _impl_.thumbnail_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000010u;
 }
 inline const std::string& ExternalAdReplyInfo::thumbnail() const {
   // @@protoc_insertion_point(field_get:proto.ExternalAdReplyInfo.thumbnail)
@@ -25462,8 +26028,8 @@ inline const std::string& ExternalAdReplyInfo::thumbnail() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ExternalAdReplyInfo::set_thumbnail(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000010u;
- thumbnail_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000010u;
+ _impl_.thumbnail_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ExternalAdReplyInfo.thumbnail)
 }
 inline std::string* ExternalAdReplyInfo::mutable_thumbnail() {
@@ -25472,46 +26038,56 @@ inline std::string* ExternalAdReplyInfo::mutable_thumbnail() {
   return _s;
 }
 inline const std::string& ExternalAdReplyInfo::_internal_thumbnail() const {
-  return thumbnail_.Get();
+  return _impl_.thumbnail_.Get();
 }
 inline void ExternalAdReplyInfo::_internal_set_thumbnail(const std::string& value) {
-  _has_bits_[0] |= 0x00000010u;
-  thumbnail_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  _impl_.thumbnail_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ExternalAdReplyInfo::_internal_mutable_thumbnail() {
-  _has_bits_[0] |= 0x00000010u;
-  return thumbnail_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  return _impl_.thumbnail_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ExternalAdReplyInfo::release_thumbnail() {
   // @@protoc_insertion_point(field_release:proto.ExternalAdReplyInfo.thumbnail)
   if (!_internal_has_thumbnail()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000010u;
-  return thumbnail_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000010u;
+  auto* p = _impl_.thumbnail_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.thumbnail_.IsDefault()) {
+    _impl_.thumbnail_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ExternalAdReplyInfo::set_allocated_thumbnail(std::string* thumbnail) {
   if (thumbnail != nullptr) {
-    _has_bits_[0] |= 0x00000010u;
+    _impl_._has_bits_[0] |= 0x00000010u;
   } else {
-    _has_bits_[0] &= ~0x00000010u;
+    _impl_._has_bits_[0] &= ~0x00000010u;
+  }
+  _impl_.thumbnail_.SetAllocated(thumbnail, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.thumbnail_.IsDefault()) {
+    _impl_.thumbnail_.Set("", GetArenaForAllocation());
   }
-  thumbnail_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), thumbnail,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ExternalAdReplyInfo.thumbnail)
 }
 
 // optional string sourceType = 7;
 inline bool ExternalAdReplyInfo::_internal_has_sourcetype() const {
-  bool value = (_has_bits_[0] & 0x00000020u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
   return value;
 }
 inline bool ExternalAdReplyInfo::has_sourcetype() const {
   return _internal_has_sourcetype();
 }
 inline void ExternalAdReplyInfo::clear_sourcetype() {
-  sourcetype_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000020u;
+  _impl_.sourcetype_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000020u;
 }
 inline const std::string& ExternalAdReplyInfo::sourcetype() const {
   // @@protoc_insertion_point(field_get:proto.ExternalAdReplyInfo.sourceType)
@@ -25520,8 +26096,8 @@ inline const std::string& ExternalAdReplyInfo::sourcetype() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ExternalAdReplyInfo::set_sourcetype(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000020u;
- sourcetype_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000020u;
+ _impl_.sourcetype_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ExternalAdReplyInfo.sourceType)
 }
 inline std::string* ExternalAdReplyInfo::mutable_sourcetype() {
@@ -25530,46 +26106,56 @@ inline std::string* ExternalAdReplyInfo::mutable_sourcetype() {
   return _s;
 }
 inline const std::string& ExternalAdReplyInfo::_internal_sourcetype() const {
-  return sourcetype_.Get();
+  return _impl_.sourcetype_.Get();
 }
 inline void ExternalAdReplyInfo::_internal_set_sourcetype(const std::string& value) {
-  _has_bits_[0] |= 0x00000020u;
-  sourcetype_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000020u;
+  _impl_.sourcetype_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ExternalAdReplyInfo::_internal_mutable_sourcetype() {
-  _has_bits_[0] |= 0x00000020u;
-  return sourcetype_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000020u;
+  return _impl_.sourcetype_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ExternalAdReplyInfo::release_sourcetype() {
   // @@protoc_insertion_point(field_release:proto.ExternalAdReplyInfo.sourceType)
   if (!_internal_has_sourcetype()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000020u;
-  return sourcetype_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000020u;
+  auto* p = _impl_.sourcetype_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.sourcetype_.IsDefault()) {
+    _impl_.sourcetype_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ExternalAdReplyInfo::set_allocated_sourcetype(std::string* sourcetype) {
   if (sourcetype != nullptr) {
-    _has_bits_[0] |= 0x00000020u;
+    _impl_._has_bits_[0] |= 0x00000020u;
   } else {
-    _has_bits_[0] &= ~0x00000020u;
+    _impl_._has_bits_[0] &= ~0x00000020u;
+  }
+  _impl_.sourcetype_.SetAllocated(sourcetype, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.sourcetype_.IsDefault()) {
+    _impl_.sourcetype_.Set("", GetArenaForAllocation());
   }
-  sourcetype_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), sourcetype,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ExternalAdReplyInfo.sourceType)
 }
 
 // optional string sourceId = 8;
 inline bool ExternalAdReplyInfo::_internal_has_sourceid() const {
-  bool value = (_has_bits_[0] & 0x00000040u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
   return value;
 }
 inline bool ExternalAdReplyInfo::has_sourceid() const {
   return _internal_has_sourceid();
 }
 inline void ExternalAdReplyInfo::clear_sourceid() {
-  sourceid_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000040u;
+  _impl_.sourceid_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000040u;
 }
 inline const std::string& ExternalAdReplyInfo::sourceid() const {
   // @@protoc_insertion_point(field_get:proto.ExternalAdReplyInfo.sourceId)
@@ -25578,8 +26164,8 @@ inline const std::string& ExternalAdReplyInfo::sourceid() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ExternalAdReplyInfo::set_sourceid(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000040u;
- sourceid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000040u;
+ _impl_.sourceid_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ExternalAdReplyInfo.sourceId)
 }
 inline std::string* ExternalAdReplyInfo::mutable_sourceid() {
@@ -25588,46 +26174,56 @@ inline std::string* ExternalAdReplyInfo::mutable_sourceid() {
   return _s;
 }
 inline const std::string& ExternalAdReplyInfo::_internal_sourceid() const {
-  return sourceid_.Get();
+  return _impl_.sourceid_.Get();
 }
 inline void ExternalAdReplyInfo::_internal_set_sourceid(const std::string& value) {
-  _has_bits_[0] |= 0x00000040u;
-  sourceid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000040u;
+  _impl_.sourceid_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ExternalAdReplyInfo::_internal_mutable_sourceid() {
-  _has_bits_[0] |= 0x00000040u;
-  return sourceid_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000040u;
+  return _impl_.sourceid_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ExternalAdReplyInfo::release_sourceid() {
   // @@protoc_insertion_point(field_release:proto.ExternalAdReplyInfo.sourceId)
   if (!_internal_has_sourceid()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000040u;
-  return sourceid_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000040u;
+  auto* p = _impl_.sourceid_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.sourceid_.IsDefault()) {
+    _impl_.sourceid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ExternalAdReplyInfo::set_allocated_sourceid(std::string* sourceid) {
   if (sourceid != nullptr) {
-    _has_bits_[0] |= 0x00000040u;
+    _impl_._has_bits_[0] |= 0x00000040u;
   } else {
-    _has_bits_[0] &= ~0x00000040u;
+    _impl_._has_bits_[0] &= ~0x00000040u;
+  }
+  _impl_.sourceid_.SetAllocated(sourceid, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.sourceid_.IsDefault()) {
+    _impl_.sourceid_.Set("", GetArenaForAllocation());
   }
-  sourceid_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), sourceid,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ExternalAdReplyInfo.sourceId)
 }
 
 // optional string sourceUrl = 9;
 inline bool ExternalAdReplyInfo::_internal_has_sourceurl() const {
-  bool value = (_has_bits_[0] & 0x00000080u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000080u) != 0;
   return value;
 }
 inline bool ExternalAdReplyInfo::has_sourceurl() const {
   return _internal_has_sourceurl();
 }
 inline void ExternalAdReplyInfo::clear_sourceurl() {
-  sourceurl_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000080u;
+  _impl_.sourceurl_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000080u;
 }
 inline const std::string& ExternalAdReplyInfo::sourceurl() const {
   // @@protoc_insertion_point(field_get:proto.ExternalAdReplyInfo.sourceUrl)
@@ -25636,8 +26232,8 @@ inline const std::string& ExternalAdReplyInfo::sourceurl() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ExternalAdReplyInfo::set_sourceurl(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000080u;
- sourceurl_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000080u;
+ _impl_.sourceurl_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ExternalAdReplyInfo.sourceUrl)
 }
 inline std::string* ExternalAdReplyInfo::mutable_sourceurl() {
@@ -25646,32 +26242,42 @@ inline std::string* ExternalAdReplyInfo::mutable_sourceurl() {
   return _s;
 }
 inline const std::string& ExternalAdReplyInfo::_internal_sourceurl() const {
-  return sourceurl_.Get();
+  return _impl_.sourceurl_.Get();
 }
 inline void ExternalAdReplyInfo::_internal_set_sourceurl(const std::string& value) {
-  _has_bits_[0] |= 0x00000080u;
-  sourceurl_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000080u;
+  _impl_.sourceurl_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ExternalAdReplyInfo::_internal_mutable_sourceurl() {
-  _has_bits_[0] |= 0x00000080u;
-  return sourceurl_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000080u;
+  return _impl_.sourceurl_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ExternalAdReplyInfo::release_sourceurl() {
   // @@protoc_insertion_point(field_release:proto.ExternalAdReplyInfo.sourceUrl)
   if (!_internal_has_sourceurl()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000080u;
-  return sourceurl_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000080u;
+  auto* p = _impl_.sourceurl_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.sourceurl_.IsDefault()) {
+    _impl_.sourceurl_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ExternalAdReplyInfo::set_allocated_sourceurl(std::string* sourceurl) {
   if (sourceurl != nullptr) {
-    _has_bits_[0] |= 0x00000080u;
+    _impl_._has_bits_[0] |= 0x00000080u;
   } else {
-    _has_bits_[0] &= ~0x00000080u;
+    _impl_._has_bits_[0] &= ~0x00000080u;
+  }
+  _impl_.sourceurl_.SetAllocated(sourceurl, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.sourceurl_.IsDefault()) {
+    _impl_.sourceurl_.Set("", GetArenaForAllocation());
   }
-  sourceurl_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), sourceurl,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ExternalAdReplyInfo.sourceUrl)
 }
 
@@ -25681,15 +26287,15 @@ inline void ExternalAdReplyInfo::set_allocated_sourceurl(std::string* sourceurl)
 
 // optional string stanzaId = 1;
 inline bool ContextInfo::_internal_has_stanzaid() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool ContextInfo::has_stanzaid() const {
   return _internal_has_stanzaid();
 }
 inline void ContextInfo::clear_stanzaid() {
-  stanzaid_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.stanzaid_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& ContextInfo::stanzaid() const {
   // @@protoc_insertion_point(field_get:proto.ContextInfo.stanzaId)
@@ -25698,8 +26304,8 @@ inline const std::string& ContextInfo::stanzaid() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ContextInfo::set_stanzaid(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- stanzaid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.stanzaid_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ContextInfo.stanzaId)
 }
 inline std::string* ContextInfo::mutable_stanzaid() {
@@ -25708,46 +26314,56 @@ inline std::string* ContextInfo::mutable_stanzaid() {
   return _s;
 }
 inline const std::string& ContextInfo::_internal_stanzaid() const {
-  return stanzaid_.Get();
+  return _impl_.stanzaid_.Get();
 }
 inline void ContextInfo::_internal_set_stanzaid(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  stanzaid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.stanzaid_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ContextInfo::_internal_mutable_stanzaid() {
-  _has_bits_[0] |= 0x00000001u;
-  return stanzaid_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.stanzaid_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ContextInfo::release_stanzaid() {
   // @@protoc_insertion_point(field_release:proto.ContextInfo.stanzaId)
   if (!_internal_has_stanzaid()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return stanzaid_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.stanzaid_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.stanzaid_.IsDefault()) {
+    _impl_.stanzaid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ContextInfo::set_allocated_stanzaid(std::string* stanzaid) {
   if (stanzaid != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
+  }
+  _impl_.stanzaid_.SetAllocated(stanzaid, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.stanzaid_.IsDefault()) {
+    _impl_.stanzaid_.Set("", GetArenaForAllocation());
   }
-  stanzaid_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), stanzaid,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ContextInfo.stanzaId)
 }
 
 // optional string participant = 2;
 inline bool ContextInfo::_internal_has_participant() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool ContextInfo::has_participant() const {
   return _internal_has_participant();
 }
 inline void ContextInfo::clear_participant() {
-  participant_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.participant_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& ContextInfo::participant() const {
   // @@protoc_insertion_point(field_get:proto.ContextInfo.participant)
@@ -25756,8 +26372,8 @@ inline const std::string& ContextInfo::participant() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ContextInfo::set_participant(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- participant_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.participant_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ContextInfo.participant)
 }
 inline std::string* ContextInfo::mutable_participant() {
@@ -25766,50 +26382,60 @@ inline std::string* ContextInfo::mutable_participant() {
   return _s;
 }
 inline const std::string& ContextInfo::_internal_participant() const {
-  return participant_.Get();
+  return _impl_.participant_.Get();
 }
 inline void ContextInfo::_internal_set_participant(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  participant_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.participant_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ContextInfo::_internal_mutable_participant() {
-  _has_bits_[0] |= 0x00000002u;
-  return participant_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.participant_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ContextInfo::release_participant() {
   // @@protoc_insertion_point(field_release:proto.ContextInfo.participant)
   if (!_internal_has_participant()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return participant_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.participant_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.participant_.IsDefault()) {
+    _impl_.participant_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ContextInfo::set_allocated_participant(std::string* participant) {
   if (participant != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  participant_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), participant,
-      GetArenaForAllocation());
+  _impl_.participant_.SetAllocated(participant, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.participant_.IsDefault()) {
+    _impl_.participant_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ContextInfo.participant)
 }
 
 // optional .proto.Message quotedMessage = 3;
 inline bool ContextInfo::_internal_has_quotedmessage() const {
-  bool value = (_has_bits_[0] & 0x00000040u) != 0;
-  PROTOBUF_ASSUME(!value || quotedmessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.quotedmessage_ != nullptr);
   return value;
 }
 inline bool ContextInfo::has_quotedmessage() const {
   return _internal_has_quotedmessage();
 }
 inline void ContextInfo::clear_quotedmessage() {
-  if (quotedmessage_ != nullptr) quotedmessage_->Clear();
-  _has_bits_[0] &= ~0x00000040u;
+  if (_impl_.quotedmessage_ != nullptr) _impl_.quotedmessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000040u;
 }
 inline const ::proto::Message& ContextInfo::_internal_quotedmessage() const {
-  const ::proto::Message* p = quotedmessage_;
+  const ::proto::Message* p = _impl_.quotedmessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::Message&>(
       ::proto::_Message_default_instance_);
 }
@@ -25820,20 +26446,20 @@ inline const ::proto::Message& ContextInfo::quotedmessage() const {
 inline void ContextInfo::unsafe_arena_set_allocated_quotedmessage(
     ::proto::Message* quotedmessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(quotedmessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.quotedmessage_);
   }
-  quotedmessage_ = quotedmessage;
+  _impl_.quotedmessage_ = quotedmessage;
   if (quotedmessage) {
-    _has_bits_[0] |= 0x00000040u;
+    _impl_._has_bits_[0] |= 0x00000040u;
   } else {
-    _has_bits_[0] &= ~0x00000040u;
+    _impl_._has_bits_[0] &= ~0x00000040u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.ContextInfo.quotedMessage)
 }
 inline ::proto::Message* ContextInfo::release_quotedmessage() {
-  _has_bits_[0] &= ~0x00000040u;
-  ::proto::Message* temp = quotedmessage_;
-  quotedmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000040u;
+  ::proto::Message* temp = _impl_.quotedmessage_;
+  _impl_.quotedmessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -25847,18 +26473,18 @@ inline ::proto::Message* ContextInfo::release_quotedmessage() {
 }
 inline ::proto::Message* ContextInfo::unsafe_arena_release_quotedmessage() {
   // @@protoc_insertion_point(field_release:proto.ContextInfo.quotedMessage)
-  _has_bits_[0] &= ~0x00000040u;
-  ::proto::Message* temp = quotedmessage_;
-  quotedmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000040u;
+  ::proto::Message* temp = _impl_.quotedmessage_;
+  _impl_.quotedmessage_ = nullptr;
   return temp;
 }
 inline ::proto::Message* ContextInfo::_internal_mutable_quotedmessage() {
-  _has_bits_[0] |= 0x00000040u;
-  if (quotedmessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000040u;
+  if (_impl_.quotedmessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::Message>(GetArenaForAllocation());
-    quotedmessage_ = p;
+    _impl_.quotedmessage_ = p;
   }
-  return quotedmessage_;
+  return _impl_.quotedmessage_;
 }
 inline ::proto::Message* ContextInfo::mutable_quotedmessage() {
   ::proto::Message* _msg = _internal_mutable_quotedmessage();
@@ -25868,34 +26494,34 @@ inline ::proto::Message* ContextInfo::mutable_quotedmessage() {
 inline void ContextInfo::set_allocated_quotedmessage(::proto::Message* quotedmessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete quotedmessage_;
+    delete _impl_.quotedmessage_;
   }
   if (quotedmessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::Message>::GetOwningArena(quotedmessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(quotedmessage);
     if (message_arena != submessage_arena) {
       quotedmessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, quotedmessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000040u;
+    _impl_._has_bits_[0] |= 0x00000040u;
   } else {
-    _has_bits_[0] &= ~0x00000040u;
+    _impl_._has_bits_[0] &= ~0x00000040u;
   }
-  quotedmessage_ = quotedmessage;
+  _impl_.quotedmessage_ = quotedmessage;
   // @@protoc_insertion_point(field_set_allocated:proto.ContextInfo.quotedMessage)
 }
 
 // optional string remoteJid = 4;
 inline bool ContextInfo::_internal_has_remotejid() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool ContextInfo::has_remotejid() const {
   return _internal_has_remotejid();
 }
 inline void ContextInfo::clear_remotejid() {
-  remotejid_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.remotejid_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const std::string& ContextInfo::remotejid() const {
   // @@protoc_insertion_point(field_get:proto.ContextInfo.remoteJid)
@@ -25904,8 +26530,8 @@ inline const std::string& ContextInfo::remotejid() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ContextInfo::set_remotejid(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000004u;
- remotejid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000004u;
+ _impl_.remotejid_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ContextInfo.remoteJid)
 }
 inline std::string* ContextInfo::mutable_remotejid() {
@@ -25914,44 +26540,54 @@ inline std::string* ContextInfo::mutable_remotejid() {
   return _s;
 }
 inline const std::string& ContextInfo::_internal_remotejid() const {
-  return remotejid_.Get();
+  return _impl_.remotejid_.Get();
 }
 inline void ContextInfo::_internal_set_remotejid(const std::string& value) {
-  _has_bits_[0] |= 0x00000004u;
-  remotejid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.remotejid_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ContextInfo::_internal_mutable_remotejid() {
-  _has_bits_[0] |= 0x00000004u;
-  return remotejid_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  return _impl_.remotejid_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ContextInfo::release_remotejid() {
   // @@protoc_insertion_point(field_release:proto.ContextInfo.remoteJid)
   if (!_internal_has_remotejid()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000004u;
-  return remotejid_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  auto* p = _impl_.remotejid_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.remotejid_.IsDefault()) {
+    _impl_.remotejid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ContextInfo::set_allocated_remotejid(std::string* remotejid) {
   if (remotejid != nullptr) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
-  remotejid_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), remotejid,
-      GetArenaForAllocation());
+  _impl_.remotejid_.SetAllocated(remotejid, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.remotejid_.IsDefault()) {
+    _impl_.remotejid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ContextInfo.remoteJid)
 }
 
 // repeated string mentionedJid = 15;
 inline int ContextInfo::_internal_mentionedjid_size() const {
-  return mentionedjid_.size();
+  return _impl_.mentionedjid_.size();
 }
 inline int ContextInfo::mentionedjid_size() const {
   return _internal_mentionedjid_size();
 }
 inline void ContextInfo::clear_mentionedjid() {
-  mentionedjid_.Clear();
+  _impl_.mentionedjid_.Clear();
 }
 inline std::string* ContextInfo::add_mentionedjid() {
   std::string* _s = _internal_add_mentionedjid();
@@ -25959,7 +26595,7 @@ inline std::string* ContextInfo::add_mentionedjid() {
   return _s;
 }
 inline const std::string& ContextInfo::_internal_mentionedjid(int index) const {
-  return mentionedjid_.Get(index);
+  return _impl_.mentionedjid_.Get(index);
 }
 inline const std::string& ContextInfo::mentionedjid(int index) const {
   // @@protoc_insertion_point(field_get:proto.ContextInfo.mentionedJid)
@@ -25967,68 +26603,68 @@ inline const std::string& ContextInfo::mentionedjid(int index) const {
 }
 inline std::string* ContextInfo::mutable_mentionedjid(int index) {
   // @@protoc_insertion_point(field_mutable:proto.ContextInfo.mentionedJid)
-  return mentionedjid_.Mutable(index);
+  return _impl_.mentionedjid_.Mutable(index);
 }
 inline void ContextInfo::set_mentionedjid(int index, const std::string& value) {
-  mentionedjid_.Mutable(index)->assign(value);
+  _impl_.mentionedjid_.Mutable(index)->assign(value);
   // @@protoc_insertion_point(field_set:proto.ContextInfo.mentionedJid)
 }
 inline void ContextInfo::set_mentionedjid(int index, std::string&& value) {
-  mentionedjid_.Mutable(index)->assign(std::move(value));
+  _impl_.mentionedjid_.Mutable(index)->assign(std::move(value));
   // @@protoc_insertion_point(field_set:proto.ContextInfo.mentionedJid)
 }
 inline void ContextInfo::set_mentionedjid(int index, const char* value) {
   GOOGLE_DCHECK(value != nullptr);
-  mentionedjid_.Mutable(index)->assign(value);
+  _impl_.mentionedjid_.Mutable(index)->assign(value);
   // @@protoc_insertion_point(field_set_char:proto.ContextInfo.mentionedJid)
 }
 inline void ContextInfo::set_mentionedjid(int index, const char* value, size_t size) {
-  mentionedjid_.Mutable(index)->assign(
+  _impl_.mentionedjid_.Mutable(index)->assign(
     reinterpret_cast<const char*>(value), size);
   // @@protoc_insertion_point(field_set_pointer:proto.ContextInfo.mentionedJid)
 }
 inline std::string* ContextInfo::_internal_add_mentionedjid() {
-  return mentionedjid_.Add();
+  return _impl_.mentionedjid_.Add();
 }
 inline void ContextInfo::add_mentionedjid(const std::string& value) {
-  mentionedjid_.Add()->assign(value);
+  _impl_.mentionedjid_.Add()->assign(value);
   // @@protoc_insertion_point(field_add:proto.ContextInfo.mentionedJid)
 }
 inline void ContextInfo::add_mentionedjid(std::string&& value) {
-  mentionedjid_.Add(std::move(value));
+  _impl_.mentionedjid_.Add(std::move(value));
   // @@protoc_insertion_point(field_add:proto.ContextInfo.mentionedJid)
 }
 inline void ContextInfo::add_mentionedjid(const char* value) {
   GOOGLE_DCHECK(value != nullptr);
-  mentionedjid_.Add()->assign(value);
+  _impl_.mentionedjid_.Add()->assign(value);
   // @@protoc_insertion_point(field_add_char:proto.ContextInfo.mentionedJid)
 }
 inline void ContextInfo::add_mentionedjid(const char* value, size_t size) {
-  mentionedjid_.Add()->assign(reinterpret_cast<const char*>(value), size);
+  _impl_.mentionedjid_.Add()->assign(reinterpret_cast<const char*>(value), size);
   // @@protoc_insertion_point(field_add_pointer:proto.ContextInfo.mentionedJid)
 }
 inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>&
 ContextInfo::mentionedjid() const {
   // @@protoc_insertion_point(field_list:proto.ContextInfo.mentionedJid)
-  return mentionedjid_;
+  return _impl_.mentionedjid_;
 }
 inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>*
 ContextInfo::mutable_mentionedjid() {
   // @@protoc_insertion_point(field_mutable_list:proto.ContextInfo.mentionedJid)
-  return &mentionedjid_;
+  return &_impl_.mentionedjid_;
 }
 
 // optional string conversionSource = 18;
 inline bool ContextInfo::_internal_has_conversionsource() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool ContextInfo::has_conversionsource() const {
   return _internal_has_conversionsource();
 }
 inline void ContextInfo::clear_conversionsource() {
-  conversionsource_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.conversionsource_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline const std::string& ContextInfo::conversionsource() const {
   // @@protoc_insertion_point(field_get:proto.ContextInfo.conversionSource)
@@ -26037,8 +26673,8 @@ inline const std::string& ContextInfo::conversionsource() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ContextInfo::set_conversionsource(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000008u;
- conversionsource_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000008u;
+ _impl_.conversionsource_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ContextInfo.conversionSource)
 }
 inline std::string* ContextInfo::mutable_conversionsource() {
@@ -26047,46 +26683,56 @@ inline std::string* ContextInfo::mutable_conversionsource() {
   return _s;
 }
 inline const std::string& ContextInfo::_internal_conversionsource() const {
-  return conversionsource_.Get();
+  return _impl_.conversionsource_.Get();
 }
 inline void ContextInfo::_internal_set_conversionsource(const std::string& value) {
-  _has_bits_[0] |= 0x00000008u;
-  conversionsource_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.conversionsource_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ContextInfo::_internal_mutable_conversionsource() {
-  _has_bits_[0] |= 0x00000008u;
-  return conversionsource_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  return _impl_.conversionsource_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ContextInfo::release_conversionsource() {
   // @@protoc_insertion_point(field_release:proto.ContextInfo.conversionSource)
   if (!_internal_has_conversionsource()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000008u;
-  return conversionsource_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  auto* p = _impl_.conversionsource_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.conversionsource_.IsDefault()) {
+    _impl_.conversionsource_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ContextInfo::set_allocated_conversionsource(std::string* conversionsource) {
   if (conversionsource != nullptr) {
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
   }
-  conversionsource_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), conversionsource,
-      GetArenaForAllocation());
+  _impl_.conversionsource_.SetAllocated(conversionsource, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.conversionsource_.IsDefault()) {
+    _impl_.conversionsource_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ContextInfo.conversionSource)
 }
 
 // optional bytes conversionData = 19;
 inline bool ContextInfo::_internal_has_conversiondata() const {
-  bool value = (_has_bits_[0] & 0x00000010u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
   return value;
 }
 inline bool ContextInfo::has_conversiondata() const {
   return _internal_has_conversiondata();
 }
 inline void ContextInfo::clear_conversiondata() {
-  conversiondata_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000010u;
+  _impl_.conversiondata_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000010u;
 }
 inline const std::string& ContextInfo::conversiondata() const {
   // @@protoc_insertion_point(field_get:proto.ContextInfo.conversionData)
@@ -26095,8 +26741,8 @@ inline const std::string& ContextInfo::conversiondata() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ContextInfo::set_conversiondata(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000010u;
- conversiondata_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000010u;
+ _impl_.conversiondata_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ContextInfo.conversionData)
 }
 inline std::string* ContextInfo::mutable_conversiondata() {
@@ -26105,113 +26751,123 @@ inline std::string* ContextInfo::mutable_conversiondata() {
   return _s;
 }
 inline const std::string& ContextInfo::_internal_conversiondata() const {
-  return conversiondata_.Get();
+  return _impl_.conversiondata_.Get();
 }
 inline void ContextInfo::_internal_set_conversiondata(const std::string& value) {
-  _has_bits_[0] |= 0x00000010u;
-  conversiondata_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  _impl_.conversiondata_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ContextInfo::_internal_mutable_conversiondata() {
-  _has_bits_[0] |= 0x00000010u;
-  return conversiondata_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  return _impl_.conversiondata_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ContextInfo::release_conversiondata() {
   // @@protoc_insertion_point(field_release:proto.ContextInfo.conversionData)
   if (!_internal_has_conversiondata()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000010u;
-  return conversiondata_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000010u;
+  auto* p = _impl_.conversiondata_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.conversiondata_.IsDefault()) {
+    _impl_.conversiondata_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ContextInfo::set_allocated_conversiondata(std::string* conversiondata) {
   if (conversiondata != nullptr) {
-    _has_bits_[0] |= 0x00000010u;
+    _impl_._has_bits_[0] |= 0x00000010u;
   } else {
-    _has_bits_[0] &= ~0x00000010u;
+    _impl_._has_bits_[0] &= ~0x00000010u;
   }
-  conversiondata_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), conversiondata,
-      GetArenaForAllocation());
+  _impl_.conversiondata_.SetAllocated(conversiondata, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.conversiondata_.IsDefault()) {
+    _impl_.conversiondata_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ContextInfo.conversionData)
 }
 
 // optional uint32 conversionDelaySeconds = 20;
 inline bool ContextInfo::_internal_has_conversiondelayseconds() const {
-  bool value = (_has_bits_[0] & 0x00000400u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000400u) != 0;
   return value;
 }
 inline bool ContextInfo::has_conversiondelayseconds() const {
   return _internal_has_conversiondelayseconds();
 }
 inline void ContextInfo::clear_conversiondelayseconds() {
-  conversiondelayseconds_ = 0u;
-  _has_bits_[0] &= ~0x00000400u;
+  _impl_.conversiondelayseconds_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000400u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 ContextInfo::_internal_conversiondelayseconds() const {
-  return conversiondelayseconds_;
+inline uint32_t ContextInfo::_internal_conversiondelayseconds() const {
+  return _impl_.conversiondelayseconds_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 ContextInfo::conversiondelayseconds() const {
+inline uint32_t ContextInfo::conversiondelayseconds() const {
   // @@protoc_insertion_point(field_get:proto.ContextInfo.conversionDelaySeconds)
   return _internal_conversiondelayseconds();
 }
-inline void ContextInfo::_internal_set_conversiondelayseconds(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000400u;
-  conversiondelayseconds_ = value;
+inline void ContextInfo::_internal_set_conversiondelayseconds(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000400u;
+  _impl_.conversiondelayseconds_ = value;
 }
-inline void ContextInfo::set_conversiondelayseconds(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void ContextInfo::set_conversiondelayseconds(uint32_t value) {
   _internal_set_conversiondelayseconds(value);
   // @@protoc_insertion_point(field_set:proto.ContextInfo.conversionDelaySeconds)
 }
 
 // optional uint32 forwardingScore = 21;
 inline bool ContextInfo::_internal_has_forwardingscore() const {
-  bool value = (_has_bits_[0] & 0x00000800u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000800u) != 0;
   return value;
 }
 inline bool ContextInfo::has_forwardingscore() const {
   return _internal_has_forwardingscore();
 }
 inline void ContextInfo::clear_forwardingscore() {
-  forwardingscore_ = 0u;
-  _has_bits_[0] &= ~0x00000800u;
+  _impl_.forwardingscore_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000800u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 ContextInfo::_internal_forwardingscore() const {
-  return forwardingscore_;
+inline uint32_t ContextInfo::_internal_forwardingscore() const {
+  return _impl_.forwardingscore_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 ContextInfo::forwardingscore() const {
+inline uint32_t ContextInfo::forwardingscore() const {
   // @@protoc_insertion_point(field_get:proto.ContextInfo.forwardingScore)
   return _internal_forwardingscore();
 }
-inline void ContextInfo::_internal_set_forwardingscore(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000800u;
-  forwardingscore_ = value;
+inline void ContextInfo::_internal_set_forwardingscore(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000800u;
+  _impl_.forwardingscore_ = value;
 }
-inline void ContextInfo::set_forwardingscore(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void ContextInfo::set_forwardingscore(uint32_t value) {
   _internal_set_forwardingscore(value);
   // @@protoc_insertion_point(field_set:proto.ContextInfo.forwardingScore)
 }
 
 // optional bool isForwarded = 22;
 inline bool ContextInfo::_internal_has_isforwarded() const {
-  bool value = (_has_bits_[0] & 0x00001000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00001000u) != 0;
   return value;
 }
 inline bool ContextInfo::has_isforwarded() const {
   return _internal_has_isforwarded();
 }
 inline void ContextInfo::clear_isforwarded() {
-  isforwarded_ = false;
-  _has_bits_[0] &= ~0x00001000u;
+  _impl_.isforwarded_ = false;
+  _impl_._has_bits_[0] &= ~0x00001000u;
 }
 inline bool ContextInfo::_internal_isforwarded() const {
-  return isforwarded_;
+  return _impl_.isforwarded_;
 }
 inline bool ContextInfo::isforwarded() const {
   // @@protoc_insertion_point(field_get:proto.ContextInfo.isForwarded)
   return _internal_isforwarded();
 }
 inline void ContextInfo::_internal_set_isforwarded(bool value) {
-  _has_bits_[0] |= 0x00001000u;
-  isforwarded_ = value;
+  _impl_._has_bits_[0] |= 0x00001000u;
+  _impl_.isforwarded_ = value;
 }
 inline void ContextInfo::set_isforwarded(bool value) {
   _internal_set_isforwarded(value);
@@ -26220,19 +26876,19 @@ inline void ContextInfo::set_isforwarded(bool value) {
 
 // optional .proto.AdReplyInfo quotedAd = 23;
 inline bool ContextInfo::_internal_has_quotedad() const {
-  bool value = (_has_bits_[0] & 0x00000080u) != 0;
-  PROTOBUF_ASSUME(!value || quotedad_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000080u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.quotedad_ != nullptr);
   return value;
 }
 inline bool ContextInfo::has_quotedad() const {
   return _internal_has_quotedad();
 }
 inline void ContextInfo::clear_quotedad() {
-  if (quotedad_ != nullptr) quotedad_->Clear();
-  _has_bits_[0] &= ~0x00000080u;
+  if (_impl_.quotedad_ != nullptr) _impl_.quotedad_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000080u;
 }
 inline const ::proto::AdReplyInfo& ContextInfo::_internal_quotedad() const {
-  const ::proto::AdReplyInfo* p = quotedad_;
+  const ::proto::AdReplyInfo* p = _impl_.quotedad_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::AdReplyInfo&>(
       ::proto::_AdReplyInfo_default_instance_);
 }
@@ -26243,20 +26899,20 @@ inline const ::proto::AdReplyInfo& ContextInfo::quotedad() const {
 inline void ContextInfo::unsafe_arena_set_allocated_quotedad(
     ::proto::AdReplyInfo* quotedad) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(quotedad_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.quotedad_);
   }
-  quotedad_ = quotedad;
+  _impl_.quotedad_ = quotedad;
   if (quotedad) {
-    _has_bits_[0] |= 0x00000080u;
+    _impl_._has_bits_[0] |= 0x00000080u;
   } else {
-    _has_bits_[0] &= ~0x00000080u;
+    _impl_._has_bits_[0] &= ~0x00000080u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.ContextInfo.quotedAd)
 }
 inline ::proto::AdReplyInfo* ContextInfo::release_quotedad() {
-  _has_bits_[0] &= ~0x00000080u;
-  ::proto::AdReplyInfo* temp = quotedad_;
-  quotedad_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000080u;
+  ::proto::AdReplyInfo* temp = _impl_.quotedad_;
+  _impl_.quotedad_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -26270,18 +26926,18 @@ inline ::proto::AdReplyInfo* ContextInfo::release_quotedad() {
 }
 inline ::proto::AdReplyInfo* ContextInfo::unsafe_arena_release_quotedad() {
   // @@protoc_insertion_point(field_release:proto.ContextInfo.quotedAd)
-  _has_bits_[0] &= ~0x00000080u;
-  ::proto::AdReplyInfo* temp = quotedad_;
-  quotedad_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000080u;
+  ::proto::AdReplyInfo* temp = _impl_.quotedad_;
+  _impl_.quotedad_ = nullptr;
   return temp;
 }
 inline ::proto::AdReplyInfo* ContextInfo::_internal_mutable_quotedad() {
-  _has_bits_[0] |= 0x00000080u;
-  if (quotedad_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000080u;
+  if (_impl_.quotedad_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::AdReplyInfo>(GetArenaForAllocation());
-    quotedad_ = p;
+    _impl_.quotedad_ = p;
   }
-  return quotedad_;
+  return _impl_.quotedad_;
 }
 inline ::proto::AdReplyInfo* ContextInfo::mutable_quotedad() {
   ::proto::AdReplyInfo* _msg = _internal_mutable_quotedad();
@@ -26291,38 +26947,38 @@ inline ::proto::AdReplyInfo* ContextInfo::mutable_quotedad() {
 inline void ContextInfo::set_allocated_quotedad(::proto::AdReplyInfo* quotedad) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete quotedad_;
+    delete _impl_.quotedad_;
   }
   if (quotedad) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::AdReplyInfo>::GetOwningArena(quotedad);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(quotedad);
     if (message_arena != submessage_arena) {
       quotedad = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, quotedad, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000080u;
+    _impl_._has_bits_[0] |= 0x00000080u;
   } else {
-    _has_bits_[0] &= ~0x00000080u;
+    _impl_._has_bits_[0] &= ~0x00000080u;
   }
-  quotedad_ = quotedad;
+  _impl_.quotedad_ = quotedad;
   // @@protoc_insertion_point(field_set_allocated:proto.ContextInfo.quotedAd)
 }
 
 // optional .proto.MessageKey placeholderKey = 24;
 inline bool ContextInfo::_internal_has_placeholderkey() const {
-  bool value = (_has_bits_[0] & 0x00000100u) != 0;
-  PROTOBUF_ASSUME(!value || placeholderkey_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000100u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.placeholderkey_ != nullptr);
   return value;
 }
 inline bool ContextInfo::has_placeholderkey() const {
   return _internal_has_placeholderkey();
 }
 inline void ContextInfo::clear_placeholderkey() {
-  if (placeholderkey_ != nullptr) placeholderkey_->Clear();
-  _has_bits_[0] &= ~0x00000100u;
+  if (_impl_.placeholderkey_ != nullptr) _impl_.placeholderkey_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000100u;
 }
 inline const ::proto::MessageKey& ContextInfo::_internal_placeholderkey() const {
-  const ::proto::MessageKey* p = placeholderkey_;
+  const ::proto::MessageKey* p = _impl_.placeholderkey_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::MessageKey&>(
       ::proto::_MessageKey_default_instance_);
 }
@@ -26333,20 +26989,20 @@ inline const ::proto::MessageKey& ContextInfo::placeholderkey() const {
 inline void ContextInfo::unsafe_arena_set_allocated_placeholderkey(
     ::proto::MessageKey* placeholderkey) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(placeholderkey_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.placeholderkey_);
   }
-  placeholderkey_ = placeholderkey;
+  _impl_.placeholderkey_ = placeholderkey;
   if (placeholderkey) {
-    _has_bits_[0] |= 0x00000100u;
+    _impl_._has_bits_[0] |= 0x00000100u;
   } else {
-    _has_bits_[0] &= ~0x00000100u;
+    _impl_._has_bits_[0] &= ~0x00000100u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.ContextInfo.placeholderKey)
 }
 inline ::proto::MessageKey* ContextInfo::release_placeholderkey() {
-  _has_bits_[0] &= ~0x00000100u;
-  ::proto::MessageKey* temp = placeholderkey_;
-  placeholderkey_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000100u;
+  ::proto::MessageKey* temp = _impl_.placeholderkey_;
+  _impl_.placeholderkey_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -26360,18 +27016,18 @@ inline ::proto::MessageKey* ContextInfo::release_placeholderkey() {
 }
 inline ::proto::MessageKey* ContextInfo::unsafe_arena_release_placeholderkey() {
   // @@protoc_insertion_point(field_release:proto.ContextInfo.placeholderKey)
-  _has_bits_[0] &= ~0x00000100u;
-  ::proto::MessageKey* temp = placeholderkey_;
-  placeholderkey_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000100u;
+  ::proto::MessageKey* temp = _impl_.placeholderkey_;
+  _impl_.placeholderkey_ = nullptr;
   return temp;
 }
 inline ::proto::MessageKey* ContextInfo::_internal_mutable_placeholderkey() {
-  _has_bits_[0] |= 0x00000100u;
-  if (placeholderkey_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000100u;
+  if (_impl_.placeholderkey_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::MessageKey>(GetArenaForAllocation());
-    placeholderkey_ = p;
+    _impl_.placeholderkey_ = p;
   }
-  return placeholderkey_;
+  return _impl_.placeholderkey_;
 }
 inline ::proto::MessageKey* ContextInfo::mutable_placeholderkey() {
   ::proto::MessageKey* _msg = _internal_mutable_placeholderkey();
@@ -26381,90 +27037,90 @@ inline ::proto::MessageKey* ContextInfo::mutable_placeholderkey() {
 inline void ContextInfo::set_allocated_placeholderkey(::proto::MessageKey* placeholderkey) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete placeholderkey_;
+    delete _impl_.placeholderkey_;
   }
   if (placeholderkey) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::MessageKey>::GetOwningArena(placeholderkey);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(placeholderkey);
     if (message_arena != submessage_arena) {
       placeholderkey = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, placeholderkey, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000100u;
+    _impl_._has_bits_[0] |= 0x00000100u;
   } else {
-    _has_bits_[0] &= ~0x00000100u;
+    _impl_._has_bits_[0] &= ~0x00000100u;
   }
-  placeholderkey_ = placeholderkey;
+  _impl_.placeholderkey_ = placeholderkey;
   // @@protoc_insertion_point(field_set_allocated:proto.ContextInfo.placeholderKey)
 }
 
 // optional uint32 expiration = 25;
 inline bool ContextInfo::_internal_has_expiration() const {
-  bool value = (_has_bits_[0] & 0x00002000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00002000u) != 0;
   return value;
 }
 inline bool ContextInfo::has_expiration() const {
   return _internal_has_expiration();
 }
 inline void ContextInfo::clear_expiration() {
-  expiration_ = 0u;
-  _has_bits_[0] &= ~0x00002000u;
+  _impl_.expiration_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00002000u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 ContextInfo::_internal_expiration() const {
-  return expiration_;
+inline uint32_t ContextInfo::_internal_expiration() const {
+  return _impl_.expiration_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 ContextInfo::expiration() const {
+inline uint32_t ContextInfo::expiration() const {
   // @@protoc_insertion_point(field_get:proto.ContextInfo.expiration)
   return _internal_expiration();
 }
-inline void ContextInfo::_internal_set_expiration(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00002000u;
-  expiration_ = value;
+inline void ContextInfo::_internal_set_expiration(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00002000u;
+  _impl_.expiration_ = value;
 }
-inline void ContextInfo::set_expiration(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void ContextInfo::set_expiration(uint32_t value) {
   _internal_set_expiration(value);
   // @@protoc_insertion_point(field_set:proto.ContextInfo.expiration)
 }
 
 // optional int64 ephemeralSettingTimestamp = 26;
 inline bool ContextInfo::_internal_has_ephemeralsettingtimestamp() const {
-  bool value = (_has_bits_[0] & 0x00004000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00004000u) != 0;
   return value;
 }
 inline bool ContextInfo::has_ephemeralsettingtimestamp() const {
   return _internal_has_ephemeralsettingtimestamp();
 }
 inline void ContextInfo::clear_ephemeralsettingtimestamp() {
-  ephemeralsettingtimestamp_ = int64_t{0};
-  _has_bits_[0] &= ~0x00004000u;
+  _impl_.ephemeralsettingtimestamp_ = int64_t{0};
+  _impl_._has_bits_[0] &= ~0x00004000u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 ContextInfo::_internal_ephemeralsettingtimestamp() const {
-  return ephemeralsettingtimestamp_;
+inline int64_t ContextInfo::_internal_ephemeralsettingtimestamp() const {
+  return _impl_.ephemeralsettingtimestamp_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 ContextInfo::ephemeralsettingtimestamp() const {
+inline int64_t ContextInfo::ephemeralsettingtimestamp() const {
   // @@protoc_insertion_point(field_get:proto.ContextInfo.ephemeralSettingTimestamp)
   return _internal_ephemeralsettingtimestamp();
 }
-inline void ContextInfo::_internal_set_ephemeralsettingtimestamp(::PROTOBUF_NAMESPACE_ID::int64 value) {
-  _has_bits_[0] |= 0x00004000u;
-  ephemeralsettingtimestamp_ = value;
+inline void ContextInfo::_internal_set_ephemeralsettingtimestamp(int64_t value) {
+  _impl_._has_bits_[0] |= 0x00004000u;
+  _impl_.ephemeralsettingtimestamp_ = value;
 }
-inline void ContextInfo::set_ephemeralsettingtimestamp(::PROTOBUF_NAMESPACE_ID::int64 value) {
+inline void ContextInfo::set_ephemeralsettingtimestamp(int64_t value) {
   _internal_set_ephemeralsettingtimestamp(value);
   // @@protoc_insertion_point(field_set:proto.ContextInfo.ephemeralSettingTimestamp)
 }
 
 // optional bytes ephemeralSharedSecret = 27;
 inline bool ContextInfo::_internal_has_ephemeralsharedsecret() const {
-  bool value = (_has_bits_[0] & 0x00000020u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
   return value;
 }
 inline bool ContextInfo::has_ephemeralsharedsecret() const {
   return _internal_has_ephemeralsharedsecret();
 }
 inline void ContextInfo::clear_ephemeralsharedsecret() {
-  ephemeralsharedsecret_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000020u;
+  _impl_.ephemeralsharedsecret_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000020u;
 }
 inline const std::string& ContextInfo::ephemeralsharedsecret() const {
   // @@protoc_insertion_point(field_get:proto.ContextInfo.ephemeralSharedSecret)
@@ -26473,8 +27129,8 @@ inline const std::string& ContextInfo::ephemeralsharedsecret() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ContextInfo::set_ephemeralsharedsecret(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000020u;
- ephemeralsharedsecret_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000020u;
+ _impl_.ephemeralsharedsecret_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ContextInfo.ephemeralSharedSecret)
 }
 inline std::string* ContextInfo::mutable_ephemeralsharedsecret() {
@@ -26483,50 +27139,60 @@ inline std::string* ContextInfo::mutable_ephemeralsharedsecret() {
   return _s;
 }
 inline const std::string& ContextInfo::_internal_ephemeralsharedsecret() const {
-  return ephemeralsharedsecret_.Get();
+  return _impl_.ephemeralsharedsecret_.Get();
 }
 inline void ContextInfo::_internal_set_ephemeralsharedsecret(const std::string& value) {
-  _has_bits_[0] |= 0x00000020u;
-  ephemeralsharedsecret_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000020u;
+  _impl_.ephemeralsharedsecret_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ContextInfo::_internal_mutable_ephemeralsharedsecret() {
-  _has_bits_[0] |= 0x00000020u;
-  return ephemeralsharedsecret_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000020u;
+  return _impl_.ephemeralsharedsecret_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ContextInfo::release_ephemeralsharedsecret() {
   // @@protoc_insertion_point(field_release:proto.ContextInfo.ephemeralSharedSecret)
   if (!_internal_has_ephemeralsharedsecret()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000020u;
-  return ephemeralsharedsecret_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000020u;
+  auto* p = _impl_.ephemeralsharedsecret_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.ephemeralsharedsecret_.IsDefault()) {
+    _impl_.ephemeralsharedsecret_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ContextInfo::set_allocated_ephemeralsharedsecret(std::string* ephemeralsharedsecret) {
   if (ephemeralsharedsecret != nullptr) {
-    _has_bits_[0] |= 0x00000020u;
+    _impl_._has_bits_[0] |= 0x00000020u;
   } else {
-    _has_bits_[0] &= ~0x00000020u;
+    _impl_._has_bits_[0] &= ~0x00000020u;
   }
-  ephemeralsharedsecret_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ephemeralsharedsecret,
-      GetArenaForAllocation());
+  _impl_.ephemeralsharedsecret_.SetAllocated(ephemeralsharedsecret, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.ephemeralsharedsecret_.IsDefault()) {
+    _impl_.ephemeralsharedsecret_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ContextInfo.ephemeralSharedSecret)
 }
 
 // optional .proto.ExternalAdReplyInfo externalAdReply = 28;
 inline bool ContextInfo::_internal_has_externaladreply() const {
-  bool value = (_has_bits_[0] & 0x00000200u) != 0;
-  PROTOBUF_ASSUME(!value || externaladreply_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000200u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.externaladreply_ != nullptr);
   return value;
 }
 inline bool ContextInfo::has_externaladreply() const {
   return _internal_has_externaladreply();
 }
 inline void ContextInfo::clear_externaladreply() {
-  if (externaladreply_ != nullptr) externaladreply_->Clear();
-  _has_bits_[0] &= ~0x00000200u;
+  if (_impl_.externaladreply_ != nullptr) _impl_.externaladreply_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000200u;
 }
 inline const ::proto::ExternalAdReplyInfo& ContextInfo::_internal_externaladreply() const {
-  const ::proto::ExternalAdReplyInfo* p = externaladreply_;
+  const ::proto::ExternalAdReplyInfo* p = _impl_.externaladreply_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ExternalAdReplyInfo&>(
       ::proto::_ExternalAdReplyInfo_default_instance_);
 }
@@ -26537,20 +27203,20 @@ inline const ::proto::ExternalAdReplyInfo& ContextInfo::externaladreply() const
 inline void ContextInfo::unsafe_arena_set_allocated_externaladreply(
     ::proto::ExternalAdReplyInfo* externaladreply) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(externaladreply_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.externaladreply_);
   }
-  externaladreply_ = externaladreply;
+  _impl_.externaladreply_ = externaladreply;
   if (externaladreply) {
-    _has_bits_[0] |= 0x00000200u;
+    _impl_._has_bits_[0] |= 0x00000200u;
   } else {
-    _has_bits_[0] &= ~0x00000200u;
+    _impl_._has_bits_[0] &= ~0x00000200u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.ContextInfo.externalAdReply)
 }
 inline ::proto::ExternalAdReplyInfo* ContextInfo::release_externaladreply() {
-  _has_bits_[0] &= ~0x00000200u;
-  ::proto::ExternalAdReplyInfo* temp = externaladreply_;
-  externaladreply_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000200u;
+  ::proto::ExternalAdReplyInfo* temp = _impl_.externaladreply_;
+  _impl_.externaladreply_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -26564,18 +27230,18 @@ inline ::proto::ExternalAdReplyInfo* ContextInfo::release_externaladreply() {
 }
 inline ::proto::ExternalAdReplyInfo* ContextInfo::unsafe_arena_release_externaladreply() {
   // @@protoc_insertion_point(field_release:proto.ContextInfo.externalAdReply)
-  _has_bits_[0] &= ~0x00000200u;
-  ::proto::ExternalAdReplyInfo* temp = externaladreply_;
-  externaladreply_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000200u;
+  ::proto::ExternalAdReplyInfo* temp = _impl_.externaladreply_;
+  _impl_.externaladreply_ = nullptr;
   return temp;
 }
 inline ::proto::ExternalAdReplyInfo* ContextInfo::_internal_mutable_externaladreply() {
-  _has_bits_[0] |= 0x00000200u;
-  if (externaladreply_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000200u;
+  if (_impl_.externaladreply_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ExternalAdReplyInfo>(GetArenaForAllocation());
-    externaladreply_ = p;
+    _impl_.externaladreply_ = p;
   }
-  return externaladreply_;
+  return _impl_.externaladreply_;
 }
 inline ::proto::ExternalAdReplyInfo* ContextInfo::mutable_externaladreply() {
   ::proto::ExternalAdReplyInfo* _msg = _internal_mutable_externaladreply();
@@ -26585,20 +27251,20 @@ inline ::proto::ExternalAdReplyInfo* ContextInfo::mutable_externaladreply() {
 inline void ContextInfo::set_allocated_externaladreply(::proto::ExternalAdReplyInfo* externaladreply) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete externaladreply_;
+    delete _impl_.externaladreply_;
   }
   if (externaladreply) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ExternalAdReplyInfo>::GetOwningArena(externaladreply);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(externaladreply);
     if (message_arena != submessage_arena) {
       externaladreply = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, externaladreply, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000200u;
+    _impl_._has_bits_[0] |= 0x00000200u;
   } else {
-    _has_bits_[0] &= ~0x00000200u;
+    _impl_._has_bits_[0] &= ~0x00000200u;
   }
-  externaladreply_ = externaladreply;
+  _impl_.externaladreply_ = externaladreply;
   // @@protoc_insertion_point(field_set_allocated:proto.ContextInfo.externalAdReply)
 }
 
@@ -26608,15 +27274,15 @@ inline void ContextInfo::set_allocated_externaladreply(::proto::ExternalAdReplyI
 
 // optional string groupId = 1;
 inline bool SenderKeyDistributionMessage::_internal_has_groupid() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool SenderKeyDistributionMessage::has_groupid() const {
   return _internal_has_groupid();
 }
 inline void SenderKeyDistributionMessage::clear_groupid() {
-  groupid_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.groupid_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& SenderKeyDistributionMessage::groupid() const {
   // @@protoc_insertion_point(field_get:proto.SenderKeyDistributionMessage.groupId)
@@ -26625,8 +27291,8 @@ inline const std::string& SenderKeyDistributionMessage::groupid() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void SenderKeyDistributionMessage::set_groupid(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- groupid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.groupid_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.SenderKeyDistributionMessage.groupId)
 }
 inline std::string* SenderKeyDistributionMessage::mutable_groupid() {
@@ -26635,46 +27301,56 @@ inline std::string* SenderKeyDistributionMessage::mutable_groupid() {
   return _s;
 }
 inline const std::string& SenderKeyDistributionMessage::_internal_groupid() const {
-  return groupid_.Get();
+  return _impl_.groupid_.Get();
 }
 inline void SenderKeyDistributionMessage::_internal_set_groupid(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  groupid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.groupid_.Set(value, GetArenaForAllocation());
 }
 inline std::string* SenderKeyDistributionMessage::_internal_mutable_groupid() {
-  _has_bits_[0] |= 0x00000001u;
-  return groupid_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.groupid_.Mutable(GetArenaForAllocation());
 }
 inline std::string* SenderKeyDistributionMessage::release_groupid() {
   // @@protoc_insertion_point(field_release:proto.SenderKeyDistributionMessage.groupId)
   if (!_internal_has_groupid()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return groupid_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.groupid_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.groupid_.IsDefault()) {
+    _impl_.groupid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void SenderKeyDistributionMessage::set_allocated_groupid(std::string* groupid) {
   if (groupid != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  groupid_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), groupid,
-      GetArenaForAllocation());
+  _impl_.groupid_.SetAllocated(groupid, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.groupid_.IsDefault()) {
+    _impl_.groupid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.SenderKeyDistributionMessage.groupId)
 }
 
 // optional bytes axolotlSenderKeyDistributionMessage = 2;
 inline bool SenderKeyDistributionMessage::_internal_has_axolotlsenderkeydistributionmessage() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool SenderKeyDistributionMessage::has_axolotlsenderkeydistributionmessage() const {
   return _internal_has_axolotlsenderkeydistributionmessage();
 }
 inline void SenderKeyDistributionMessage::clear_axolotlsenderkeydistributionmessage() {
-  axolotlsenderkeydistributionmessage_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.axolotlsenderkeydistributionmessage_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& SenderKeyDistributionMessage::axolotlsenderkeydistributionmessage() const {
   // @@protoc_insertion_point(field_get:proto.SenderKeyDistributionMessage.axolotlSenderKeyDistributionMessage)
@@ -26683,8 +27359,8 @@ inline const std::string& SenderKeyDistributionMessage::axolotlsenderkeydistribu
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void SenderKeyDistributionMessage::set_axolotlsenderkeydistributionmessage(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- axolotlsenderkeydistributionmessage_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.axolotlsenderkeydistributionmessage_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.SenderKeyDistributionMessage.axolotlSenderKeyDistributionMessage)
 }
 inline std::string* SenderKeyDistributionMessage::mutable_axolotlsenderkeydistributionmessage() {
@@ -26693,32 +27369,42 @@ inline std::string* SenderKeyDistributionMessage::mutable_axolotlsenderkeydistri
   return _s;
 }
 inline const std::string& SenderKeyDistributionMessage::_internal_axolotlsenderkeydistributionmessage() const {
-  return axolotlsenderkeydistributionmessage_.Get();
+  return _impl_.axolotlsenderkeydistributionmessage_.Get();
 }
 inline void SenderKeyDistributionMessage::_internal_set_axolotlsenderkeydistributionmessage(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  axolotlsenderkeydistributionmessage_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.axolotlsenderkeydistributionmessage_.Set(value, GetArenaForAllocation());
 }
 inline std::string* SenderKeyDistributionMessage::_internal_mutable_axolotlsenderkeydistributionmessage() {
-  _has_bits_[0] |= 0x00000002u;
-  return axolotlsenderkeydistributionmessage_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.axolotlsenderkeydistributionmessage_.Mutable(GetArenaForAllocation());
 }
 inline std::string* SenderKeyDistributionMessage::release_axolotlsenderkeydistributionmessage() {
   // @@protoc_insertion_point(field_release:proto.SenderKeyDistributionMessage.axolotlSenderKeyDistributionMessage)
   if (!_internal_has_axolotlsenderkeydistributionmessage()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return axolotlsenderkeydistributionmessage_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.axolotlsenderkeydistributionmessage_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.axolotlsenderkeydistributionmessage_.IsDefault()) {
+    _impl_.axolotlsenderkeydistributionmessage_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void SenderKeyDistributionMessage::set_allocated_axolotlsenderkeydistributionmessage(std::string* axolotlsenderkeydistributionmessage) {
   if (axolotlsenderkeydistributionmessage != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  axolotlsenderkeydistributionmessage_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), axolotlsenderkeydistributionmessage,
-      GetArenaForAllocation());
+  _impl_.axolotlsenderkeydistributionmessage_.SetAllocated(axolotlsenderkeydistributionmessage, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.axolotlsenderkeydistributionmessage_.IsDefault()) {
+    _impl_.axolotlsenderkeydistributionmessage_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.SenderKeyDistributionMessage.axolotlSenderKeyDistributionMessage)
 }
 
@@ -26728,15 +27414,15 @@ inline void SenderKeyDistributionMessage::set_allocated_axolotlsenderkeydistribu
 
 // optional string url = 1;
 inline bool ImageMessage::_internal_has_url() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool ImageMessage::has_url() const {
   return _internal_has_url();
 }
 inline void ImageMessage::clear_url() {
-  url_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.url_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& ImageMessage::url() const {
   // @@protoc_insertion_point(field_get:proto.ImageMessage.url)
@@ -26745,8 +27431,8 @@ inline const std::string& ImageMessage::url() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ImageMessage::set_url(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- url_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.url_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ImageMessage.url)
 }
 inline std::string* ImageMessage::mutable_url() {
@@ -26755,46 +27441,56 @@ inline std::string* ImageMessage::mutable_url() {
   return _s;
 }
 inline const std::string& ImageMessage::_internal_url() const {
-  return url_.Get();
+  return _impl_.url_.Get();
 }
 inline void ImageMessage::_internal_set_url(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  url_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.url_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ImageMessage::_internal_mutable_url() {
-  _has_bits_[0] |= 0x00000001u;
-  return url_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.url_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ImageMessage::release_url() {
   // @@protoc_insertion_point(field_release:proto.ImageMessage.url)
   if (!_internal_has_url()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return url_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.url_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.url_.IsDefault()) {
+    _impl_.url_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ImageMessage::set_allocated_url(std::string* url) {
   if (url != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
+  }
+  _impl_.url_.SetAllocated(url, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.url_.IsDefault()) {
+    _impl_.url_.Set("", GetArenaForAllocation());
   }
-  url_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), url,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ImageMessage.url)
 }
 
 // optional string mimetype = 2;
 inline bool ImageMessage::_internal_has_mimetype() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool ImageMessage::has_mimetype() const {
   return _internal_has_mimetype();
 }
 inline void ImageMessage::clear_mimetype() {
-  mimetype_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.mimetype_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& ImageMessage::mimetype() const {
   // @@protoc_insertion_point(field_get:proto.ImageMessage.mimetype)
@@ -26803,8 +27499,8 @@ inline const std::string& ImageMessage::mimetype() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ImageMessage::set_mimetype(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- mimetype_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.mimetype_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ImageMessage.mimetype)
 }
 inline std::string* ImageMessage::mutable_mimetype() {
@@ -26813,46 +27509,56 @@ inline std::string* ImageMessage::mutable_mimetype() {
   return _s;
 }
 inline const std::string& ImageMessage::_internal_mimetype() const {
-  return mimetype_.Get();
+  return _impl_.mimetype_.Get();
 }
 inline void ImageMessage::_internal_set_mimetype(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  mimetype_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.mimetype_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ImageMessage::_internal_mutable_mimetype() {
-  _has_bits_[0] |= 0x00000002u;
-  return mimetype_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.mimetype_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ImageMessage::release_mimetype() {
   // @@protoc_insertion_point(field_release:proto.ImageMessage.mimetype)
   if (!_internal_has_mimetype()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return mimetype_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.mimetype_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.mimetype_.IsDefault()) {
+    _impl_.mimetype_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ImageMessage::set_allocated_mimetype(std::string* mimetype) {
   if (mimetype != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
+  }
+  _impl_.mimetype_.SetAllocated(mimetype, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.mimetype_.IsDefault()) {
+    _impl_.mimetype_.Set("", GetArenaForAllocation());
   }
-  mimetype_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), mimetype,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ImageMessage.mimetype)
 }
 
 // optional string caption = 3;
 inline bool ImageMessage::_internal_has_caption() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool ImageMessage::has_caption() const {
   return _internal_has_caption();
 }
 inline void ImageMessage::clear_caption() {
-  caption_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.caption_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const std::string& ImageMessage::caption() const {
   // @@protoc_insertion_point(field_get:proto.ImageMessage.caption)
@@ -26861,8 +27567,8 @@ inline const std::string& ImageMessage::caption() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ImageMessage::set_caption(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000004u;
- caption_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000004u;
+ _impl_.caption_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ImageMessage.caption)
 }
 inline std::string* ImageMessage::mutable_caption() {
@@ -26871,46 +27577,56 @@ inline std::string* ImageMessage::mutable_caption() {
   return _s;
 }
 inline const std::string& ImageMessage::_internal_caption() const {
-  return caption_.Get();
+  return _impl_.caption_.Get();
 }
 inline void ImageMessage::_internal_set_caption(const std::string& value) {
-  _has_bits_[0] |= 0x00000004u;
-  caption_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.caption_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ImageMessage::_internal_mutable_caption() {
-  _has_bits_[0] |= 0x00000004u;
-  return caption_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  return _impl_.caption_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ImageMessage::release_caption() {
   // @@protoc_insertion_point(field_release:proto.ImageMessage.caption)
   if (!_internal_has_caption()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000004u;
-  return caption_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  auto* p = _impl_.caption_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.caption_.IsDefault()) {
+    _impl_.caption_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ImageMessage::set_allocated_caption(std::string* caption) {
   if (caption != nullptr) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
+  }
+  _impl_.caption_.SetAllocated(caption, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.caption_.IsDefault()) {
+    _impl_.caption_.Set("", GetArenaForAllocation());
   }
-  caption_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), caption,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ImageMessage.caption)
 }
 
 // optional bytes fileSha256 = 4;
 inline bool ImageMessage::_internal_has_filesha256() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool ImageMessage::has_filesha256() const {
   return _internal_has_filesha256();
 }
 inline void ImageMessage::clear_filesha256() {
-  filesha256_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.filesha256_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline const std::string& ImageMessage::filesha256() const {
   // @@protoc_insertion_point(field_get:proto.ImageMessage.fileSha256)
@@ -26919,8 +27635,8 @@ inline const std::string& ImageMessage::filesha256() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ImageMessage::set_filesha256(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000008u;
- filesha256_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000008u;
+ _impl_.filesha256_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ImageMessage.fileSha256)
 }
 inline std::string* ImageMessage::mutable_filesha256() {
@@ -26929,130 +27645,140 @@ inline std::string* ImageMessage::mutable_filesha256() {
   return _s;
 }
 inline const std::string& ImageMessage::_internal_filesha256() const {
-  return filesha256_.Get();
+  return _impl_.filesha256_.Get();
 }
 inline void ImageMessage::_internal_set_filesha256(const std::string& value) {
-  _has_bits_[0] |= 0x00000008u;
-  filesha256_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.filesha256_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ImageMessage::_internal_mutable_filesha256() {
-  _has_bits_[0] |= 0x00000008u;
-  return filesha256_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  return _impl_.filesha256_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ImageMessage::release_filesha256() {
   // @@protoc_insertion_point(field_release:proto.ImageMessage.fileSha256)
   if (!_internal_has_filesha256()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000008u;
-  return filesha256_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  auto* p = _impl_.filesha256_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.filesha256_.IsDefault()) {
+    _impl_.filesha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ImageMessage::set_allocated_filesha256(std::string* filesha256) {
   if (filesha256 != nullptr) {
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
+  }
+  _impl_.filesha256_.SetAllocated(filesha256, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.filesha256_.IsDefault()) {
+    _impl_.filesha256_.Set("", GetArenaForAllocation());
   }
-  filesha256_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), filesha256,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ImageMessage.fileSha256)
 }
 
 // optional uint64 fileLength = 5;
 inline bool ImageMessage::_internal_has_filelength() const {
-  bool value = (_has_bits_[0] & 0x00010000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00010000u) != 0;
   return value;
 }
 inline bool ImageMessage::has_filelength() const {
   return _internal_has_filelength();
 }
 inline void ImageMessage::clear_filelength() {
-  filelength_ = uint64_t{0u};
-  _has_bits_[0] &= ~0x00010000u;
+  _impl_.filelength_ = uint64_t{0u};
+  _impl_._has_bits_[0] &= ~0x00010000u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 ImageMessage::_internal_filelength() const {
-  return filelength_;
+inline uint64_t ImageMessage::_internal_filelength() const {
+  return _impl_.filelength_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 ImageMessage::filelength() const {
+inline uint64_t ImageMessage::filelength() const {
   // @@protoc_insertion_point(field_get:proto.ImageMessage.fileLength)
   return _internal_filelength();
 }
-inline void ImageMessage::_internal_set_filelength(::PROTOBUF_NAMESPACE_ID::uint64 value) {
-  _has_bits_[0] |= 0x00010000u;
-  filelength_ = value;
+inline void ImageMessage::_internal_set_filelength(uint64_t value) {
+  _impl_._has_bits_[0] |= 0x00010000u;
+  _impl_.filelength_ = value;
 }
-inline void ImageMessage::set_filelength(::PROTOBUF_NAMESPACE_ID::uint64 value) {
+inline void ImageMessage::set_filelength(uint64_t value) {
   _internal_set_filelength(value);
   // @@protoc_insertion_point(field_set:proto.ImageMessage.fileLength)
 }
 
 // optional uint32 height = 6;
 inline bool ImageMessage::_internal_has_height() const {
-  bool value = (_has_bits_[0] & 0x00020000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00020000u) != 0;
   return value;
 }
 inline bool ImageMessage::has_height() const {
   return _internal_has_height();
 }
 inline void ImageMessage::clear_height() {
-  height_ = 0u;
-  _has_bits_[0] &= ~0x00020000u;
+  _impl_.height_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00020000u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 ImageMessage::_internal_height() const {
-  return height_;
+inline uint32_t ImageMessage::_internal_height() const {
+  return _impl_.height_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 ImageMessage::height() const {
+inline uint32_t ImageMessage::height() const {
   // @@protoc_insertion_point(field_get:proto.ImageMessage.height)
   return _internal_height();
 }
-inline void ImageMessage::_internal_set_height(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00020000u;
-  height_ = value;
+inline void ImageMessage::_internal_set_height(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00020000u;
+  _impl_.height_ = value;
 }
-inline void ImageMessage::set_height(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void ImageMessage::set_height(uint32_t value) {
   _internal_set_height(value);
   // @@protoc_insertion_point(field_set:proto.ImageMessage.height)
 }
 
 // optional uint32 width = 7;
 inline bool ImageMessage::_internal_has_width() const {
-  bool value = (_has_bits_[0] & 0x00040000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00040000u) != 0;
   return value;
 }
 inline bool ImageMessage::has_width() const {
   return _internal_has_width();
 }
 inline void ImageMessage::clear_width() {
-  width_ = 0u;
-  _has_bits_[0] &= ~0x00040000u;
+  _impl_.width_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00040000u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 ImageMessage::_internal_width() const {
-  return width_;
+inline uint32_t ImageMessage::_internal_width() const {
+  return _impl_.width_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 ImageMessage::width() const {
+inline uint32_t ImageMessage::width() const {
   // @@protoc_insertion_point(field_get:proto.ImageMessage.width)
   return _internal_width();
 }
-inline void ImageMessage::_internal_set_width(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00040000u;
-  width_ = value;
+inline void ImageMessage::_internal_set_width(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00040000u;
+  _impl_.width_ = value;
 }
-inline void ImageMessage::set_width(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void ImageMessage::set_width(uint32_t value) {
   _internal_set_width(value);
   // @@protoc_insertion_point(field_set:proto.ImageMessage.width)
 }
 
 // optional bytes mediaKey = 8;
 inline bool ImageMessage::_internal_has_mediakey() const {
-  bool value = (_has_bits_[0] & 0x00000010u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
   return value;
 }
 inline bool ImageMessage::has_mediakey() const {
   return _internal_has_mediakey();
 }
 inline void ImageMessage::clear_mediakey() {
-  mediakey_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000010u;
+  _impl_.mediakey_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000010u;
 }
 inline const std::string& ImageMessage::mediakey() const {
   // @@protoc_insertion_point(field_get:proto.ImageMessage.mediaKey)
@@ -27061,8 +27787,8 @@ inline const std::string& ImageMessage::mediakey() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ImageMessage::set_mediakey(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000010u;
- mediakey_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000010u;
+ _impl_.mediakey_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ImageMessage.mediaKey)
 }
 inline std::string* ImageMessage::mutable_mediakey() {
@@ -27071,46 +27797,56 @@ inline std::string* ImageMessage::mutable_mediakey() {
   return _s;
 }
 inline const std::string& ImageMessage::_internal_mediakey() const {
-  return mediakey_.Get();
+  return _impl_.mediakey_.Get();
 }
 inline void ImageMessage::_internal_set_mediakey(const std::string& value) {
-  _has_bits_[0] |= 0x00000010u;
-  mediakey_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  _impl_.mediakey_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ImageMessage::_internal_mutable_mediakey() {
-  _has_bits_[0] |= 0x00000010u;
-  return mediakey_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  return _impl_.mediakey_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ImageMessage::release_mediakey() {
   // @@protoc_insertion_point(field_release:proto.ImageMessage.mediaKey)
   if (!_internal_has_mediakey()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000010u;
-  return mediakey_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000010u;
+  auto* p = _impl_.mediakey_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.mediakey_.IsDefault()) {
+    _impl_.mediakey_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ImageMessage::set_allocated_mediakey(std::string* mediakey) {
   if (mediakey != nullptr) {
-    _has_bits_[0] |= 0x00000010u;
+    _impl_._has_bits_[0] |= 0x00000010u;
   } else {
-    _has_bits_[0] &= ~0x00000010u;
+    _impl_._has_bits_[0] &= ~0x00000010u;
   }
-  mediakey_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), mediakey,
-      GetArenaForAllocation());
+  _impl_.mediakey_.SetAllocated(mediakey, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.mediakey_.IsDefault()) {
+    _impl_.mediakey_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ImageMessage.mediaKey)
 }
 
 // optional bytes fileEncSha256 = 9;
 inline bool ImageMessage::_internal_has_fileencsha256() const {
-  bool value = (_has_bits_[0] & 0x00000020u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
   return value;
 }
 inline bool ImageMessage::has_fileencsha256() const {
   return _internal_has_fileencsha256();
 }
 inline void ImageMessage::clear_fileencsha256() {
-  fileencsha256_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000020u;
+  _impl_.fileencsha256_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000020u;
 }
 inline const std::string& ImageMessage::fileencsha256() const {
   // @@protoc_insertion_point(field_get:proto.ImageMessage.fileEncSha256)
@@ -27119,8 +27855,8 @@ inline const std::string& ImageMessage::fileencsha256() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ImageMessage::set_fileencsha256(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000020u;
- fileencsha256_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000020u;
+ _impl_.fileencsha256_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ImageMessage.fileEncSha256)
 }
 inline std::string* ImageMessage::mutable_fileencsha256() {
@@ -27129,63 +27865,73 @@ inline std::string* ImageMessage::mutable_fileencsha256() {
   return _s;
 }
 inline const std::string& ImageMessage::_internal_fileencsha256() const {
-  return fileencsha256_.Get();
+  return _impl_.fileencsha256_.Get();
 }
 inline void ImageMessage::_internal_set_fileencsha256(const std::string& value) {
-  _has_bits_[0] |= 0x00000020u;
-  fileencsha256_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000020u;
+  _impl_.fileencsha256_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ImageMessage::_internal_mutable_fileencsha256() {
-  _has_bits_[0] |= 0x00000020u;
-  return fileencsha256_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000020u;
+  return _impl_.fileencsha256_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ImageMessage::release_fileencsha256() {
   // @@protoc_insertion_point(field_release:proto.ImageMessage.fileEncSha256)
   if (!_internal_has_fileencsha256()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000020u;
-  return fileencsha256_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000020u;
+  auto* p = _impl_.fileencsha256_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.fileencsha256_.IsDefault()) {
+    _impl_.fileencsha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ImageMessage::set_allocated_fileencsha256(std::string* fileencsha256) {
   if (fileencsha256 != nullptr) {
-    _has_bits_[0] |= 0x00000020u;
+    _impl_._has_bits_[0] |= 0x00000020u;
   } else {
-    _has_bits_[0] &= ~0x00000020u;
+    _impl_._has_bits_[0] &= ~0x00000020u;
   }
-  fileencsha256_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), fileencsha256,
-      GetArenaForAllocation());
+  _impl_.fileencsha256_.SetAllocated(fileencsha256, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.fileencsha256_.IsDefault()) {
+    _impl_.fileencsha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ImageMessage.fileEncSha256)
 }
 
 // repeated .proto.InteractiveAnnotation interactiveAnnotations = 10;
 inline int ImageMessage::_internal_interactiveannotations_size() const {
-  return interactiveannotations_.size();
+  return _impl_.interactiveannotations_.size();
 }
 inline int ImageMessage::interactiveannotations_size() const {
   return _internal_interactiveannotations_size();
 }
 inline void ImageMessage::clear_interactiveannotations() {
-  interactiveannotations_.Clear();
+  _impl_.interactiveannotations_.Clear();
 }
 inline ::proto::InteractiveAnnotation* ImageMessage::mutable_interactiveannotations(int index) {
   // @@protoc_insertion_point(field_mutable:proto.ImageMessage.interactiveAnnotations)
-  return interactiveannotations_.Mutable(index);
+  return _impl_.interactiveannotations_.Mutable(index);
 }
 inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::InteractiveAnnotation >*
 ImageMessage::mutable_interactiveannotations() {
   // @@protoc_insertion_point(field_mutable_list:proto.ImageMessage.interactiveAnnotations)
-  return &interactiveannotations_;
+  return &_impl_.interactiveannotations_;
 }
 inline const ::proto::InteractiveAnnotation& ImageMessage::_internal_interactiveannotations(int index) const {
-  return interactiveannotations_.Get(index);
+  return _impl_.interactiveannotations_.Get(index);
 }
 inline const ::proto::InteractiveAnnotation& ImageMessage::interactiveannotations(int index) const {
   // @@protoc_insertion_point(field_get:proto.ImageMessage.interactiveAnnotations)
   return _internal_interactiveannotations(index);
 }
 inline ::proto::InteractiveAnnotation* ImageMessage::_internal_add_interactiveannotations() {
-  return interactiveannotations_.Add();
+  return _impl_.interactiveannotations_.Add();
 }
 inline ::proto::InteractiveAnnotation* ImageMessage::add_interactiveannotations() {
   ::proto::InteractiveAnnotation* _add = _internal_add_interactiveannotations();
@@ -27195,20 +27941,20 @@ inline ::proto::InteractiveAnnotation* ImageMessage::add_interactiveannotations(
 inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::InteractiveAnnotation >&
 ImageMessage::interactiveannotations() const {
   // @@protoc_insertion_point(field_list:proto.ImageMessage.interactiveAnnotations)
-  return interactiveannotations_;
+  return _impl_.interactiveannotations_;
 }
 
 // optional string directPath = 11;
 inline bool ImageMessage::_internal_has_directpath() const {
-  bool value = (_has_bits_[0] & 0x00000040u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
   return value;
 }
 inline bool ImageMessage::has_directpath() const {
   return _internal_has_directpath();
 }
 inline void ImageMessage::clear_directpath() {
-  directpath_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000040u;
+  _impl_.directpath_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000040u;
 }
 inline const std::string& ImageMessage::directpath() const {
   // @@protoc_insertion_point(field_get:proto.ImageMessage.directPath)
@@ -27217,8 +27963,8 @@ inline const std::string& ImageMessage::directpath() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ImageMessage::set_directpath(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000040u;
- directpath_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000040u;
+ _impl_.directpath_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ImageMessage.directPath)
 }
 inline std::string* ImageMessage::mutable_directpath() {
@@ -27227,74 +27973,84 @@ inline std::string* ImageMessage::mutable_directpath() {
   return _s;
 }
 inline const std::string& ImageMessage::_internal_directpath() const {
-  return directpath_.Get();
+  return _impl_.directpath_.Get();
 }
 inline void ImageMessage::_internal_set_directpath(const std::string& value) {
-  _has_bits_[0] |= 0x00000040u;
-  directpath_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000040u;
+  _impl_.directpath_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ImageMessage::_internal_mutable_directpath() {
-  _has_bits_[0] |= 0x00000040u;
-  return directpath_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000040u;
+  return _impl_.directpath_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ImageMessage::release_directpath() {
   // @@protoc_insertion_point(field_release:proto.ImageMessage.directPath)
   if (!_internal_has_directpath()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000040u;
-  return directpath_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000040u;
+  auto* p = _impl_.directpath_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.directpath_.IsDefault()) {
+    _impl_.directpath_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ImageMessage::set_allocated_directpath(std::string* directpath) {
   if (directpath != nullptr) {
-    _has_bits_[0] |= 0x00000040u;
+    _impl_._has_bits_[0] |= 0x00000040u;
   } else {
-    _has_bits_[0] &= ~0x00000040u;
+    _impl_._has_bits_[0] &= ~0x00000040u;
   }
-  directpath_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), directpath,
-      GetArenaForAllocation());
+  _impl_.directpath_.SetAllocated(directpath, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.directpath_.IsDefault()) {
+    _impl_.directpath_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ImageMessage.directPath)
 }
 
 // optional int64 mediaKeyTimestamp = 12;
 inline bool ImageMessage::_internal_has_mediakeytimestamp() const {
-  bool value = (_has_bits_[0] & 0x00080000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00080000u) != 0;
   return value;
 }
 inline bool ImageMessage::has_mediakeytimestamp() const {
   return _internal_has_mediakeytimestamp();
 }
 inline void ImageMessage::clear_mediakeytimestamp() {
-  mediakeytimestamp_ = int64_t{0};
-  _has_bits_[0] &= ~0x00080000u;
+  _impl_.mediakeytimestamp_ = int64_t{0};
+  _impl_._has_bits_[0] &= ~0x00080000u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 ImageMessage::_internal_mediakeytimestamp() const {
-  return mediakeytimestamp_;
+inline int64_t ImageMessage::_internal_mediakeytimestamp() const {
+  return _impl_.mediakeytimestamp_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 ImageMessage::mediakeytimestamp() const {
+inline int64_t ImageMessage::mediakeytimestamp() const {
   // @@protoc_insertion_point(field_get:proto.ImageMessage.mediaKeyTimestamp)
   return _internal_mediakeytimestamp();
 }
-inline void ImageMessage::_internal_set_mediakeytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value) {
-  _has_bits_[0] |= 0x00080000u;
-  mediakeytimestamp_ = value;
+inline void ImageMessage::_internal_set_mediakeytimestamp(int64_t value) {
+  _impl_._has_bits_[0] |= 0x00080000u;
+  _impl_.mediakeytimestamp_ = value;
 }
-inline void ImageMessage::set_mediakeytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value) {
+inline void ImageMessage::set_mediakeytimestamp(int64_t value) {
   _internal_set_mediakeytimestamp(value);
   // @@protoc_insertion_point(field_set:proto.ImageMessage.mediaKeyTimestamp)
 }
 
 // optional bytes jpegThumbnail = 16;
 inline bool ImageMessage::_internal_has_jpegthumbnail() const {
-  bool value = (_has_bits_[0] & 0x00000080u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000080u) != 0;
   return value;
 }
 inline bool ImageMessage::has_jpegthumbnail() const {
   return _internal_has_jpegthumbnail();
 }
 inline void ImageMessage::clear_jpegthumbnail() {
-  jpegthumbnail_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000080u;
+  _impl_.jpegthumbnail_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000080u;
 }
 inline const std::string& ImageMessage::jpegthumbnail() const {
   // @@protoc_insertion_point(field_get:proto.ImageMessage.jpegThumbnail)
@@ -27303,8 +28059,8 @@ inline const std::string& ImageMessage::jpegthumbnail() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ImageMessage::set_jpegthumbnail(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000080u;
- jpegthumbnail_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000080u;
+ _impl_.jpegthumbnail_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ImageMessage.jpegThumbnail)
 }
 inline std::string* ImageMessage::mutable_jpegthumbnail() {
@@ -27313,50 +28069,60 @@ inline std::string* ImageMessage::mutable_jpegthumbnail() {
   return _s;
 }
 inline const std::string& ImageMessage::_internal_jpegthumbnail() const {
-  return jpegthumbnail_.Get();
+  return _impl_.jpegthumbnail_.Get();
 }
 inline void ImageMessage::_internal_set_jpegthumbnail(const std::string& value) {
-  _has_bits_[0] |= 0x00000080u;
-  jpegthumbnail_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000080u;
+  _impl_.jpegthumbnail_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ImageMessage::_internal_mutable_jpegthumbnail() {
-  _has_bits_[0] |= 0x00000080u;
-  return jpegthumbnail_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000080u;
+  return _impl_.jpegthumbnail_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ImageMessage::release_jpegthumbnail() {
   // @@protoc_insertion_point(field_release:proto.ImageMessage.jpegThumbnail)
   if (!_internal_has_jpegthumbnail()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000080u;
-  return jpegthumbnail_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000080u;
+  auto* p = _impl_.jpegthumbnail_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.jpegthumbnail_.IsDefault()) {
+    _impl_.jpegthumbnail_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ImageMessage::set_allocated_jpegthumbnail(std::string* jpegthumbnail) {
   if (jpegthumbnail != nullptr) {
-    _has_bits_[0] |= 0x00000080u;
+    _impl_._has_bits_[0] |= 0x00000080u;
   } else {
-    _has_bits_[0] &= ~0x00000080u;
+    _impl_._has_bits_[0] &= ~0x00000080u;
+  }
+  _impl_.jpegthumbnail_.SetAllocated(jpegthumbnail, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.jpegthumbnail_.IsDefault()) {
+    _impl_.jpegthumbnail_.Set("", GetArenaForAllocation());
   }
-  jpegthumbnail_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), jpegthumbnail,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ImageMessage.jpegThumbnail)
 }
 
 // optional .proto.ContextInfo contextInfo = 17;
 inline bool ImageMessage::_internal_has_contextinfo() const {
-  bool value = (_has_bits_[0] & 0x00008000u) != 0;
-  PROTOBUF_ASSUME(!value || contextinfo_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00008000u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.contextinfo_ != nullptr);
   return value;
 }
 inline bool ImageMessage::has_contextinfo() const {
   return _internal_has_contextinfo();
 }
 inline void ImageMessage::clear_contextinfo() {
-  if (contextinfo_ != nullptr) contextinfo_->Clear();
-  _has_bits_[0] &= ~0x00008000u;
+  if (_impl_.contextinfo_ != nullptr) _impl_.contextinfo_->Clear();
+  _impl_._has_bits_[0] &= ~0x00008000u;
 }
 inline const ::proto::ContextInfo& ImageMessage::_internal_contextinfo() const {
-  const ::proto::ContextInfo* p = contextinfo_;
+  const ::proto::ContextInfo* p = _impl_.contextinfo_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ContextInfo&>(
       ::proto::_ContextInfo_default_instance_);
 }
@@ -27367,20 +28133,20 @@ inline const ::proto::ContextInfo& ImageMessage::contextinfo() const {
 inline void ImageMessage::unsafe_arena_set_allocated_contextinfo(
     ::proto::ContextInfo* contextinfo) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(contextinfo_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.contextinfo_);
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   if (contextinfo) {
-    _has_bits_[0] |= 0x00008000u;
+    _impl_._has_bits_[0] |= 0x00008000u;
   } else {
-    _has_bits_[0] &= ~0x00008000u;
+    _impl_._has_bits_[0] &= ~0x00008000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.ImageMessage.contextInfo)
 }
 inline ::proto::ContextInfo* ImageMessage::release_contextinfo() {
-  _has_bits_[0] &= ~0x00008000u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00008000u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -27394,18 +28160,18 @@ inline ::proto::ContextInfo* ImageMessage::release_contextinfo() {
 }
 inline ::proto::ContextInfo* ImageMessage::unsafe_arena_release_contextinfo() {
   // @@protoc_insertion_point(field_release:proto.ImageMessage.contextInfo)
-  _has_bits_[0] &= ~0x00008000u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00008000u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
   return temp;
 }
 inline ::proto::ContextInfo* ImageMessage::_internal_mutable_contextinfo() {
-  _has_bits_[0] |= 0x00008000u;
-  if (contextinfo_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00008000u;
+  if (_impl_.contextinfo_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ContextInfo>(GetArenaForAllocation());
-    contextinfo_ = p;
+    _impl_.contextinfo_ = p;
   }
-  return contextinfo_;
+  return _impl_.contextinfo_;
 }
 inline ::proto::ContextInfo* ImageMessage::mutable_contextinfo() {
   ::proto::ContextInfo* _msg = _internal_mutable_contextinfo();
@@ -27415,34 +28181,34 @@ inline ::proto::ContextInfo* ImageMessage::mutable_contextinfo() {
 inline void ImageMessage::set_allocated_contextinfo(::proto::ContextInfo* contextinfo) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete contextinfo_;
+    delete _impl_.contextinfo_;
   }
   if (contextinfo) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ContextInfo>::GetOwningArena(contextinfo);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(contextinfo);
     if (message_arena != submessage_arena) {
       contextinfo = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, contextinfo, submessage_arena);
     }
-    _has_bits_[0] |= 0x00008000u;
+    _impl_._has_bits_[0] |= 0x00008000u;
   } else {
-    _has_bits_[0] &= ~0x00008000u;
+    _impl_._has_bits_[0] &= ~0x00008000u;
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   // @@protoc_insertion_point(field_set_allocated:proto.ImageMessage.contextInfo)
 }
 
 // optional bytes firstScanSidecar = 18;
 inline bool ImageMessage::_internal_has_firstscansidecar() const {
-  bool value = (_has_bits_[0] & 0x00000100u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000100u) != 0;
   return value;
 }
 inline bool ImageMessage::has_firstscansidecar() const {
   return _internal_has_firstscansidecar();
 }
 inline void ImageMessage::clear_firstscansidecar() {
-  firstscansidecar_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000100u;
+  _impl_.firstscansidecar_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000100u;
 }
 inline const std::string& ImageMessage::firstscansidecar() const {
   // @@protoc_insertion_point(field_get:proto.ImageMessage.firstScanSidecar)
@@ -27451,8 +28217,8 @@ inline const std::string& ImageMessage::firstscansidecar() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ImageMessage::set_firstscansidecar(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000100u;
- firstscansidecar_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000100u;
+ _impl_.firstscansidecar_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ImageMessage.firstScanSidecar)
 }
 inline std::string* ImageMessage::mutable_firstscansidecar() {
@@ -27461,102 +28227,112 @@ inline std::string* ImageMessage::mutable_firstscansidecar() {
   return _s;
 }
 inline const std::string& ImageMessage::_internal_firstscansidecar() const {
-  return firstscansidecar_.Get();
+  return _impl_.firstscansidecar_.Get();
 }
 inline void ImageMessage::_internal_set_firstscansidecar(const std::string& value) {
-  _has_bits_[0] |= 0x00000100u;
-  firstscansidecar_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000100u;
+  _impl_.firstscansidecar_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ImageMessage::_internal_mutable_firstscansidecar() {
-  _has_bits_[0] |= 0x00000100u;
-  return firstscansidecar_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000100u;
+  return _impl_.firstscansidecar_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ImageMessage::release_firstscansidecar() {
   // @@protoc_insertion_point(field_release:proto.ImageMessage.firstScanSidecar)
   if (!_internal_has_firstscansidecar()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000100u;
-  return firstscansidecar_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000100u;
+  auto* p = _impl_.firstscansidecar_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.firstscansidecar_.IsDefault()) {
+    _impl_.firstscansidecar_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ImageMessage::set_allocated_firstscansidecar(std::string* firstscansidecar) {
   if (firstscansidecar != nullptr) {
-    _has_bits_[0] |= 0x00000100u;
+    _impl_._has_bits_[0] |= 0x00000100u;
   } else {
-    _has_bits_[0] &= ~0x00000100u;
+    _impl_._has_bits_[0] &= ~0x00000100u;
+  }
+  _impl_.firstscansidecar_.SetAllocated(firstscansidecar, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.firstscansidecar_.IsDefault()) {
+    _impl_.firstscansidecar_.Set("", GetArenaForAllocation());
   }
-  firstscansidecar_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), firstscansidecar,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ImageMessage.firstScanSidecar)
 }
 
 // optional uint32 firstScanLength = 19;
 inline bool ImageMessage::_internal_has_firstscanlength() const {
-  bool value = (_has_bits_[0] & 0x00100000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00100000u) != 0;
   return value;
 }
 inline bool ImageMessage::has_firstscanlength() const {
   return _internal_has_firstscanlength();
 }
 inline void ImageMessage::clear_firstscanlength() {
-  firstscanlength_ = 0u;
-  _has_bits_[0] &= ~0x00100000u;
+  _impl_.firstscanlength_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00100000u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 ImageMessage::_internal_firstscanlength() const {
-  return firstscanlength_;
+inline uint32_t ImageMessage::_internal_firstscanlength() const {
+  return _impl_.firstscanlength_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 ImageMessage::firstscanlength() const {
+inline uint32_t ImageMessage::firstscanlength() const {
   // @@protoc_insertion_point(field_get:proto.ImageMessage.firstScanLength)
   return _internal_firstscanlength();
 }
-inline void ImageMessage::_internal_set_firstscanlength(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00100000u;
-  firstscanlength_ = value;
+inline void ImageMessage::_internal_set_firstscanlength(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00100000u;
+  _impl_.firstscanlength_ = value;
 }
-inline void ImageMessage::set_firstscanlength(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void ImageMessage::set_firstscanlength(uint32_t value) {
   _internal_set_firstscanlength(value);
   // @@protoc_insertion_point(field_set:proto.ImageMessage.firstScanLength)
 }
 
 // optional uint32 experimentGroupId = 20;
 inline bool ImageMessage::_internal_has_experimentgroupid() const {
-  bool value = (_has_bits_[0] & 0x00200000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00200000u) != 0;
   return value;
 }
 inline bool ImageMessage::has_experimentgroupid() const {
   return _internal_has_experimentgroupid();
 }
 inline void ImageMessage::clear_experimentgroupid() {
-  experimentgroupid_ = 0u;
-  _has_bits_[0] &= ~0x00200000u;
+  _impl_.experimentgroupid_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00200000u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 ImageMessage::_internal_experimentgroupid() const {
-  return experimentgroupid_;
+inline uint32_t ImageMessage::_internal_experimentgroupid() const {
+  return _impl_.experimentgroupid_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 ImageMessage::experimentgroupid() const {
+inline uint32_t ImageMessage::experimentgroupid() const {
   // @@protoc_insertion_point(field_get:proto.ImageMessage.experimentGroupId)
   return _internal_experimentgroupid();
 }
-inline void ImageMessage::_internal_set_experimentgroupid(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00200000u;
-  experimentgroupid_ = value;
+inline void ImageMessage::_internal_set_experimentgroupid(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00200000u;
+  _impl_.experimentgroupid_ = value;
 }
-inline void ImageMessage::set_experimentgroupid(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void ImageMessage::set_experimentgroupid(uint32_t value) {
   _internal_set_experimentgroupid(value);
   // @@protoc_insertion_point(field_set:proto.ImageMessage.experimentGroupId)
 }
 
 // optional bytes scansSidecar = 21;
 inline bool ImageMessage::_internal_has_scanssidecar() const {
-  bool value = (_has_bits_[0] & 0x00000200u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000200u) != 0;
   return value;
 }
 inline bool ImageMessage::has_scanssidecar() const {
   return _internal_has_scanssidecar();
 }
 inline void ImageMessage::clear_scanssidecar() {
-  scanssidecar_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000200u;
+  _impl_.scanssidecar_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000200u;
 }
 inline const std::string& ImageMessage::scanssidecar() const {
   // @@protoc_insertion_point(field_get:proto.ImageMessage.scansSidecar)
@@ -27565,8 +28341,8 @@ inline const std::string& ImageMessage::scanssidecar() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ImageMessage::set_scanssidecar(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000200u;
- scanssidecar_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000200u;
+ _impl_.scanssidecar_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ImageMessage.scansSidecar)
 }
 inline std::string* ImageMessage::mutable_scanssidecar() {
@@ -27575,77 +28351,87 @@ inline std::string* ImageMessage::mutable_scanssidecar() {
   return _s;
 }
 inline const std::string& ImageMessage::_internal_scanssidecar() const {
-  return scanssidecar_.Get();
+  return _impl_.scanssidecar_.Get();
 }
 inline void ImageMessage::_internal_set_scanssidecar(const std::string& value) {
-  _has_bits_[0] |= 0x00000200u;
-  scanssidecar_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000200u;
+  _impl_.scanssidecar_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ImageMessage::_internal_mutable_scanssidecar() {
-  _has_bits_[0] |= 0x00000200u;
-  return scanssidecar_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000200u;
+  return _impl_.scanssidecar_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ImageMessage::release_scanssidecar() {
   // @@protoc_insertion_point(field_release:proto.ImageMessage.scansSidecar)
   if (!_internal_has_scanssidecar()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000200u;
-  return scanssidecar_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000200u;
+  auto* p = _impl_.scanssidecar_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.scanssidecar_.IsDefault()) {
+    _impl_.scanssidecar_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ImageMessage::set_allocated_scanssidecar(std::string* scanssidecar) {
   if (scanssidecar != nullptr) {
-    _has_bits_[0] |= 0x00000200u;
+    _impl_._has_bits_[0] |= 0x00000200u;
   } else {
-    _has_bits_[0] &= ~0x00000200u;
+    _impl_._has_bits_[0] &= ~0x00000200u;
+  }
+  _impl_.scanssidecar_.SetAllocated(scanssidecar, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.scanssidecar_.IsDefault()) {
+    _impl_.scanssidecar_.Set("", GetArenaForAllocation());
   }
-  scanssidecar_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), scanssidecar,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ImageMessage.scansSidecar)
 }
 
 // repeated uint32 scanLengths = 22;
 inline int ImageMessage::_internal_scanlengths_size() const {
-  return scanlengths_.size();
+  return _impl_.scanlengths_.size();
 }
 inline int ImageMessage::scanlengths_size() const {
   return _internal_scanlengths_size();
 }
 inline void ImageMessage::clear_scanlengths() {
-  scanlengths_.Clear();
+  _impl_.scanlengths_.Clear();
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 ImageMessage::_internal_scanlengths(int index) const {
-  return scanlengths_.Get(index);
+inline uint32_t ImageMessage::_internal_scanlengths(int index) const {
+  return _impl_.scanlengths_.Get(index);
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 ImageMessage::scanlengths(int index) const {
+inline uint32_t ImageMessage::scanlengths(int index) const {
   // @@protoc_insertion_point(field_get:proto.ImageMessage.scanLengths)
   return _internal_scanlengths(index);
 }
-inline void ImageMessage::set_scanlengths(int index, ::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  scanlengths_.Set(index, value);
+inline void ImageMessage::set_scanlengths(int index, uint32_t value) {
+  _impl_.scanlengths_.Set(index, value);
   // @@protoc_insertion_point(field_set:proto.ImageMessage.scanLengths)
 }
-inline void ImageMessage::_internal_add_scanlengths(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  scanlengths_.Add(value);
+inline void ImageMessage::_internal_add_scanlengths(uint32_t value) {
+  _impl_.scanlengths_.Add(value);
 }
-inline void ImageMessage::add_scanlengths(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void ImageMessage::add_scanlengths(uint32_t value) {
   _internal_add_scanlengths(value);
   // @@protoc_insertion_point(field_add:proto.ImageMessage.scanLengths)
 }
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >&
+inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >&
 ImageMessage::_internal_scanlengths() const {
-  return scanlengths_;
+  return _impl_.scanlengths_;
 }
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >&
+inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >&
 ImageMessage::scanlengths() const {
   // @@protoc_insertion_point(field_list:proto.ImageMessage.scanLengths)
   return _internal_scanlengths();
 }
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >*
+inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >*
 ImageMessage::_internal_mutable_scanlengths() {
-  return &scanlengths_;
+  return &_impl_.scanlengths_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >*
+inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >*
 ImageMessage::mutable_scanlengths() {
   // @@protoc_insertion_point(field_mutable_list:proto.ImageMessage.scanLengths)
   return _internal_mutable_scanlengths();
@@ -27653,15 +28439,15 @@ ImageMessage::mutable_scanlengths() {
 
 // optional bytes midQualityFileSha256 = 23;
 inline bool ImageMessage::_internal_has_midqualityfilesha256() const {
-  bool value = (_has_bits_[0] & 0x00000400u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000400u) != 0;
   return value;
 }
 inline bool ImageMessage::has_midqualityfilesha256() const {
   return _internal_has_midqualityfilesha256();
 }
 inline void ImageMessage::clear_midqualityfilesha256() {
-  midqualityfilesha256_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000400u;
+  _impl_.midqualityfilesha256_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000400u;
 }
 inline const std::string& ImageMessage::midqualityfilesha256() const {
   // @@protoc_insertion_point(field_get:proto.ImageMessage.midQualityFileSha256)
@@ -27670,8 +28456,8 @@ inline const std::string& ImageMessage::midqualityfilesha256() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ImageMessage::set_midqualityfilesha256(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000400u;
- midqualityfilesha256_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000400u;
+ _impl_.midqualityfilesha256_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ImageMessage.midQualityFileSha256)
 }
 inline std::string* ImageMessage::mutable_midqualityfilesha256() {
@@ -27680,46 +28466,56 @@ inline std::string* ImageMessage::mutable_midqualityfilesha256() {
   return _s;
 }
 inline const std::string& ImageMessage::_internal_midqualityfilesha256() const {
-  return midqualityfilesha256_.Get();
+  return _impl_.midqualityfilesha256_.Get();
 }
 inline void ImageMessage::_internal_set_midqualityfilesha256(const std::string& value) {
-  _has_bits_[0] |= 0x00000400u;
-  midqualityfilesha256_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000400u;
+  _impl_.midqualityfilesha256_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ImageMessage::_internal_mutable_midqualityfilesha256() {
-  _has_bits_[0] |= 0x00000400u;
-  return midqualityfilesha256_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000400u;
+  return _impl_.midqualityfilesha256_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ImageMessage::release_midqualityfilesha256() {
   // @@protoc_insertion_point(field_release:proto.ImageMessage.midQualityFileSha256)
   if (!_internal_has_midqualityfilesha256()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000400u;
-  return midqualityfilesha256_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000400u;
+  auto* p = _impl_.midqualityfilesha256_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.midqualityfilesha256_.IsDefault()) {
+    _impl_.midqualityfilesha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ImageMessage::set_allocated_midqualityfilesha256(std::string* midqualityfilesha256) {
   if (midqualityfilesha256 != nullptr) {
-    _has_bits_[0] |= 0x00000400u;
+    _impl_._has_bits_[0] |= 0x00000400u;
   } else {
-    _has_bits_[0] &= ~0x00000400u;
+    _impl_._has_bits_[0] &= ~0x00000400u;
+  }
+  _impl_.midqualityfilesha256_.SetAllocated(midqualityfilesha256, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.midqualityfilesha256_.IsDefault()) {
+    _impl_.midqualityfilesha256_.Set("", GetArenaForAllocation());
   }
-  midqualityfilesha256_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), midqualityfilesha256,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ImageMessage.midQualityFileSha256)
 }
 
 // optional bytes midQualityFileEncSha256 = 24;
 inline bool ImageMessage::_internal_has_midqualityfileencsha256() const {
-  bool value = (_has_bits_[0] & 0x00000800u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000800u) != 0;
   return value;
 }
 inline bool ImageMessage::has_midqualityfileencsha256() const {
   return _internal_has_midqualityfileencsha256();
 }
 inline void ImageMessage::clear_midqualityfileencsha256() {
-  midqualityfileencsha256_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000800u;
+  _impl_.midqualityfileencsha256_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000800u;
 }
 inline const std::string& ImageMessage::midqualityfileencsha256() const {
   // @@protoc_insertion_point(field_get:proto.ImageMessage.midQualityFileEncSha256)
@@ -27728,8 +28524,8 @@ inline const std::string& ImageMessage::midqualityfileencsha256() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ImageMessage::set_midqualityfileencsha256(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000800u;
- midqualityfileencsha256_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000800u;
+ _impl_.midqualityfileencsha256_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ImageMessage.midQualityFileEncSha256)
 }
 inline std::string* ImageMessage::mutable_midqualityfileencsha256() {
@@ -27738,57 +28534,67 @@ inline std::string* ImageMessage::mutable_midqualityfileencsha256() {
   return _s;
 }
 inline const std::string& ImageMessage::_internal_midqualityfileencsha256() const {
-  return midqualityfileencsha256_.Get();
+  return _impl_.midqualityfileencsha256_.Get();
 }
 inline void ImageMessage::_internal_set_midqualityfileencsha256(const std::string& value) {
-  _has_bits_[0] |= 0x00000800u;
-  midqualityfileencsha256_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000800u;
+  _impl_.midqualityfileencsha256_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ImageMessage::_internal_mutable_midqualityfileencsha256() {
-  _has_bits_[0] |= 0x00000800u;
-  return midqualityfileencsha256_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000800u;
+  return _impl_.midqualityfileencsha256_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ImageMessage::release_midqualityfileencsha256() {
   // @@protoc_insertion_point(field_release:proto.ImageMessage.midQualityFileEncSha256)
   if (!_internal_has_midqualityfileencsha256()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000800u;
-  return midqualityfileencsha256_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000800u;
+  auto* p = _impl_.midqualityfileencsha256_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.midqualityfileencsha256_.IsDefault()) {
+    _impl_.midqualityfileencsha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ImageMessage::set_allocated_midqualityfileencsha256(std::string* midqualityfileencsha256) {
   if (midqualityfileencsha256 != nullptr) {
-    _has_bits_[0] |= 0x00000800u;
+    _impl_._has_bits_[0] |= 0x00000800u;
   } else {
-    _has_bits_[0] &= ~0x00000800u;
+    _impl_._has_bits_[0] &= ~0x00000800u;
+  }
+  _impl_.midqualityfileencsha256_.SetAllocated(midqualityfileencsha256, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.midqualityfileencsha256_.IsDefault()) {
+    _impl_.midqualityfileencsha256_.Set("", GetArenaForAllocation());
   }
-  midqualityfileencsha256_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), midqualityfileencsha256,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ImageMessage.midQualityFileEncSha256)
 }
 
 // optional bool viewOnce = 25;
 inline bool ImageMessage::_internal_has_viewonce() const {
-  bool value = (_has_bits_[0] & 0x00400000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00400000u) != 0;
   return value;
 }
 inline bool ImageMessage::has_viewonce() const {
   return _internal_has_viewonce();
 }
 inline void ImageMessage::clear_viewonce() {
-  viewonce_ = false;
-  _has_bits_[0] &= ~0x00400000u;
+  _impl_.viewonce_ = false;
+  _impl_._has_bits_[0] &= ~0x00400000u;
 }
 inline bool ImageMessage::_internal_viewonce() const {
-  return viewonce_;
+  return _impl_.viewonce_;
 }
 inline bool ImageMessage::viewonce() const {
   // @@protoc_insertion_point(field_get:proto.ImageMessage.viewOnce)
   return _internal_viewonce();
 }
 inline void ImageMessage::_internal_set_viewonce(bool value) {
-  _has_bits_[0] |= 0x00400000u;
-  viewonce_ = value;
+  _impl_._has_bits_[0] |= 0x00400000u;
+  _impl_.viewonce_ = value;
 }
 inline void ImageMessage::set_viewonce(bool value) {
   _internal_set_viewonce(value);
@@ -27797,15 +28603,15 @@ inline void ImageMessage::set_viewonce(bool value) {
 
 // optional string thumbnailDirectPath = 26;
 inline bool ImageMessage::_internal_has_thumbnaildirectpath() const {
-  bool value = (_has_bits_[0] & 0x00001000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00001000u) != 0;
   return value;
 }
 inline bool ImageMessage::has_thumbnaildirectpath() const {
   return _internal_has_thumbnaildirectpath();
 }
 inline void ImageMessage::clear_thumbnaildirectpath() {
-  thumbnaildirectpath_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00001000u;
+  _impl_.thumbnaildirectpath_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00001000u;
 }
 inline const std::string& ImageMessage::thumbnaildirectpath() const {
   // @@protoc_insertion_point(field_get:proto.ImageMessage.thumbnailDirectPath)
@@ -27814,8 +28620,8 @@ inline const std::string& ImageMessage::thumbnaildirectpath() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ImageMessage::set_thumbnaildirectpath(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00001000u;
- thumbnaildirectpath_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00001000u;
+ _impl_.thumbnaildirectpath_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ImageMessage.thumbnailDirectPath)
 }
 inline std::string* ImageMessage::mutable_thumbnaildirectpath() {
@@ -27824,46 +28630,56 @@ inline std::string* ImageMessage::mutable_thumbnaildirectpath() {
   return _s;
 }
 inline const std::string& ImageMessage::_internal_thumbnaildirectpath() const {
-  return thumbnaildirectpath_.Get();
+  return _impl_.thumbnaildirectpath_.Get();
 }
 inline void ImageMessage::_internal_set_thumbnaildirectpath(const std::string& value) {
-  _has_bits_[0] |= 0x00001000u;
-  thumbnaildirectpath_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00001000u;
+  _impl_.thumbnaildirectpath_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ImageMessage::_internal_mutable_thumbnaildirectpath() {
-  _has_bits_[0] |= 0x00001000u;
-  return thumbnaildirectpath_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00001000u;
+  return _impl_.thumbnaildirectpath_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ImageMessage::release_thumbnaildirectpath() {
   // @@protoc_insertion_point(field_release:proto.ImageMessage.thumbnailDirectPath)
   if (!_internal_has_thumbnaildirectpath()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00001000u;
-  return thumbnaildirectpath_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00001000u;
+  auto* p = _impl_.thumbnaildirectpath_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.thumbnaildirectpath_.IsDefault()) {
+    _impl_.thumbnaildirectpath_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ImageMessage::set_allocated_thumbnaildirectpath(std::string* thumbnaildirectpath) {
   if (thumbnaildirectpath != nullptr) {
-    _has_bits_[0] |= 0x00001000u;
+    _impl_._has_bits_[0] |= 0x00001000u;
   } else {
-    _has_bits_[0] &= ~0x00001000u;
+    _impl_._has_bits_[0] &= ~0x00001000u;
+  }
+  _impl_.thumbnaildirectpath_.SetAllocated(thumbnaildirectpath, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.thumbnaildirectpath_.IsDefault()) {
+    _impl_.thumbnaildirectpath_.Set("", GetArenaForAllocation());
   }
-  thumbnaildirectpath_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), thumbnaildirectpath,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ImageMessage.thumbnailDirectPath)
 }
 
 // optional bytes thumbnailSha256 = 27;
 inline bool ImageMessage::_internal_has_thumbnailsha256() const {
-  bool value = (_has_bits_[0] & 0x00002000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00002000u) != 0;
   return value;
 }
 inline bool ImageMessage::has_thumbnailsha256() const {
   return _internal_has_thumbnailsha256();
 }
 inline void ImageMessage::clear_thumbnailsha256() {
-  thumbnailsha256_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00002000u;
+  _impl_.thumbnailsha256_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00002000u;
 }
 inline const std::string& ImageMessage::thumbnailsha256() const {
   // @@protoc_insertion_point(field_get:proto.ImageMessage.thumbnailSha256)
@@ -27872,8 +28688,8 @@ inline const std::string& ImageMessage::thumbnailsha256() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ImageMessage::set_thumbnailsha256(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00002000u;
- thumbnailsha256_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00002000u;
+ _impl_.thumbnailsha256_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ImageMessage.thumbnailSha256)
 }
 inline std::string* ImageMessage::mutable_thumbnailsha256() {
@@ -27882,46 +28698,56 @@ inline std::string* ImageMessage::mutable_thumbnailsha256() {
   return _s;
 }
 inline const std::string& ImageMessage::_internal_thumbnailsha256() const {
-  return thumbnailsha256_.Get();
+  return _impl_.thumbnailsha256_.Get();
 }
 inline void ImageMessage::_internal_set_thumbnailsha256(const std::string& value) {
-  _has_bits_[0] |= 0x00002000u;
-  thumbnailsha256_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00002000u;
+  _impl_.thumbnailsha256_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ImageMessage::_internal_mutable_thumbnailsha256() {
-  _has_bits_[0] |= 0x00002000u;
-  return thumbnailsha256_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00002000u;
+  return _impl_.thumbnailsha256_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ImageMessage::release_thumbnailsha256() {
   // @@protoc_insertion_point(field_release:proto.ImageMessage.thumbnailSha256)
   if (!_internal_has_thumbnailsha256()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00002000u;
-  return thumbnailsha256_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00002000u;
+  auto* p = _impl_.thumbnailsha256_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.thumbnailsha256_.IsDefault()) {
+    _impl_.thumbnailsha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ImageMessage::set_allocated_thumbnailsha256(std::string* thumbnailsha256) {
   if (thumbnailsha256 != nullptr) {
-    _has_bits_[0] |= 0x00002000u;
+    _impl_._has_bits_[0] |= 0x00002000u;
   } else {
-    _has_bits_[0] &= ~0x00002000u;
+    _impl_._has_bits_[0] &= ~0x00002000u;
+  }
+  _impl_.thumbnailsha256_.SetAllocated(thumbnailsha256, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.thumbnailsha256_.IsDefault()) {
+    _impl_.thumbnailsha256_.Set("", GetArenaForAllocation());
   }
-  thumbnailsha256_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), thumbnailsha256,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ImageMessage.thumbnailSha256)
 }
 
 // optional bytes thumbnailEncSha256 = 28;
 inline bool ImageMessage::_internal_has_thumbnailencsha256() const {
-  bool value = (_has_bits_[0] & 0x00004000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00004000u) != 0;
   return value;
 }
 inline bool ImageMessage::has_thumbnailencsha256() const {
   return _internal_has_thumbnailencsha256();
 }
 inline void ImageMessage::clear_thumbnailencsha256() {
-  thumbnailencsha256_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00004000u;
+  _impl_.thumbnailencsha256_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00004000u;
 }
 inline const std::string& ImageMessage::thumbnailencsha256() const {
   // @@protoc_insertion_point(field_get:proto.ImageMessage.thumbnailEncSha256)
@@ -27930,8 +28756,8 @@ inline const std::string& ImageMessage::thumbnailencsha256() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ImageMessage::set_thumbnailencsha256(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00004000u;
- thumbnailencsha256_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00004000u;
+ _impl_.thumbnailencsha256_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ImageMessage.thumbnailEncSha256)
 }
 inline std::string* ImageMessage::mutable_thumbnailencsha256() {
@@ -27940,32 +28766,42 @@ inline std::string* ImageMessage::mutable_thumbnailencsha256() {
   return _s;
 }
 inline const std::string& ImageMessage::_internal_thumbnailencsha256() const {
-  return thumbnailencsha256_.Get();
+  return _impl_.thumbnailencsha256_.Get();
 }
 inline void ImageMessage::_internal_set_thumbnailencsha256(const std::string& value) {
-  _has_bits_[0] |= 0x00004000u;
-  thumbnailencsha256_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00004000u;
+  _impl_.thumbnailencsha256_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ImageMessage::_internal_mutable_thumbnailencsha256() {
-  _has_bits_[0] |= 0x00004000u;
-  return thumbnailencsha256_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00004000u;
+  return _impl_.thumbnailencsha256_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ImageMessage::release_thumbnailencsha256() {
   // @@protoc_insertion_point(field_release:proto.ImageMessage.thumbnailEncSha256)
   if (!_internal_has_thumbnailencsha256()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00004000u;
-  return thumbnailencsha256_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00004000u;
+  auto* p = _impl_.thumbnailencsha256_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.thumbnailencsha256_.IsDefault()) {
+    _impl_.thumbnailencsha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ImageMessage::set_allocated_thumbnailencsha256(std::string* thumbnailencsha256) {
   if (thumbnailencsha256 != nullptr) {
-    _has_bits_[0] |= 0x00004000u;
+    _impl_._has_bits_[0] |= 0x00004000u;
   } else {
-    _has_bits_[0] &= ~0x00004000u;
+    _impl_._has_bits_[0] &= ~0x00004000u;
+  }
+  _impl_.thumbnailencsha256_.SetAllocated(thumbnailencsha256, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.thumbnailencsha256_.IsDefault()) {
+    _impl_.thumbnailencsha256_.Set("", GetArenaForAllocation());
   }
-  thumbnailencsha256_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), thumbnailencsha256,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ImageMessage.thumbnailEncSha256)
 }
 
@@ -27975,15 +28811,15 @@ inline void ImageMessage::set_allocated_thumbnailencsha256(std::string* thumbnai
 
 // optional string note = 1;
 inline bool InvoiceMessage::_internal_has_note() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool InvoiceMessage::has_note() const {
   return _internal_has_note();
 }
 inline void InvoiceMessage::clear_note() {
-  note_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.note_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& InvoiceMessage::note() const {
   // @@protoc_insertion_point(field_get:proto.InvoiceMessage.note)
@@ -27992,8 +28828,8 @@ inline const std::string& InvoiceMessage::note() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void InvoiceMessage::set_note(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- note_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.note_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.InvoiceMessage.note)
 }
 inline std::string* InvoiceMessage::mutable_note() {
@@ -28002,46 +28838,56 @@ inline std::string* InvoiceMessage::mutable_note() {
   return _s;
 }
 inline const std::string& InvoiceMessage::_internal_note() const {
-  return note_.Get();
+  return _impl_.note_.Get();
 }
 inline void InvoiceMessage::_internal_set_note(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  note_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.note_.Set(value, GetArenaForAllocation());
 }
 inline std::string* InvoiceMessage::_internal_mutable_note() {
-  _has_bits_[0] |= 0x00000001u;
-  return note_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.note_.Mutable(GetArenaForAllocation());
 }
 inline std::string* InvoiceMessage::release_note() {
   // @@protoc_insertion_point(field_release:proto.InvoiceMessage.note)
   if (!_internal_has_note()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return note_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.note_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.note_.IsDefault()) {
+    _impl_.note_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void InvoiceMessage::set_allocated_note(std::string* note) {
   if (note != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  note_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), note,
-      GetArenaForAllocation());
+  _impl_.note_.SetAllocated(note, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.note_.IsDefault()) {
+    _impl_.note_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.InvoiceMessage.note)
 }
 
 // optional string token = 2;
 inline bool InvoiceMessage::_internal_has_token() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool InvoiceMessage::has_token() const {
   return _internal_has_token();
 }
 inline void InvoiceMessage::clear_token() {
-  token_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.token_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& InvoiceMessage::token() const {
   // @@protoc_insertion_point(field_get:proto.InvoiceMessage.token)
@@ -28050,8 +28896,8 @@ inline const std::string& InvoiceMessage::token() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void InvoiceMessage::set_token(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- token_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.token_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.InvoiceMessage.token)
 }
 inline std::string* InvoiceMessage::mutable_token() {
@@ -28060,49 +28906,59 @@ inline std::string* InvoiceMessage::mutable_token() {
   return _s;
 }
 inline const std::string& InvoiceMessage::_internal_token() const {
-  return token_.Get();
+  return _impl_.token_.Get();
 }
 inline void InvoiceMessage::_internal_set_token(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  token_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.token_.Set(value, GetArenaForAllocation());
 }
 inline std::string* InvoiceMessage::_internal_mutable_token() {
-  _has_bits_[0] |= 0x00000002u;
-  return token_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.token_.Mutable(GetArenaForAllocation());
 }
 inline std::string* InvoiceMessage::release_token() {
   // @@protoc_insertion_point(field_release:proto.InvoiceMessage.token)
   if (!_internal_has_token()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return token_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.token_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.token_.IsDefault()) {
+    _impl_.token_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void InvoiceMessage::set_allocated_token(std::string* token) {
   if (token != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  token_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), token,
-      GetArenaForAllocation());
+  _impl_.token_.SetAllocated(token, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.token_.IsDefault()) {
+    _impl_.token_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.InvoiceMessage.token)
 }
 
 // optional .proto.InvoiceMessage.InvoiceMessageAttachmentType attachmentType = 3;
 inline bool InvoiceMessage::_internal_has_attachmenttype() const {
-  bool value = (_has_bits_[0] & 0x00000200u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000200u) != 0;
   return value;
 }
 inline bool InvoiceMessage::has_attachmenttype() const {
   return _internal_has_attachmenttype();
 }
 inline void InvoiceMessage::clear_attachmenttype() {
-  attachmenttype_ = 0;
-  _has_bits_[0] &= ~0x00000200u;
+  _impl_.attachmenttype_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000200u;
 }
 inline ::proto::InvoiceMessage_InvoiceMessageAttachmentType InvoiceMessage::_internal_attachmenttype() const {
-  return static_cast< ::proto::InvoiceMessage_InvoiceMessageAttachmentType >(attachmenttype_);
+  return static_cast< ::proto::InvoiceMessage_InvoiceMessageAttachmentType >(_impl_.attachmenttype_);
 }
 inline ::proto::InvoiceMessage_InvoiceMessageAttachmentType InvoiceMessage::attachmenttype() const {
   // @@protoc_insertion_point(field_get:proto.InvoiceMessage.attachmentType)
@@ -28110,8 +28966,8 @@ inline ::proto::InvoiceMessage_InvoiceMessageAttachmentType InvoiceMessage::atta
 }
 inline void InvoiceMessage::_internal_set_attachmenttype(::proto::InvoiceMessage_InvoiceMessageAttachmentType value) {
   assert(::proto::InvoiceMessage_InvoiceMessageAttachmentType_IsValid(value));
-  _has_bits_[0] |= 0x00000200u;
-  attachmenttype_ = value;
+  _impl_._has_bits_[0] |= 0x00000200u;
+  _impl_.attachmenttype_ = value;
 }
 inline void InvoiceMessage::set_attachmenttype(::proto::InvoiceMessage_InvoiceMessageAttachmentType value) {
   _internal_set_attachmenttype(value);
@@ -28120,15 +28976,15 @@ inline void InvoiceMessage::set_attachmenttype(::proto::InvoiceMessage_InvoiceMe
 
 // optional string attachmentMimetype = 4;
 inline bool InvoiceMessage::_internal_has_attachmentmimetype() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool InvoiceMessage::has_attachmentmimetype() const {
   return _internal_has_attachmentmimetype();
 }
 inline void InvoiceMessage::clear_attachmentmimetype() {
-  attachmentmimetype_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.attachmentmimetype_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const std::string& InvoiceMessage::attachmentmimetype() const {
   // @@protoc_insertion_point(field_get:proto.InvoiceMessage.attachmentMimetype)
@@ -28137,8 +28993,8 @@ inline const std::string& InvoiceMessage::attachmentmimetype() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void InvoiceMessage::set_attachmentmimetype(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000004u;
- attachmentmimetype_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000004u;
+ _impl_.attachmentmimetype_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.InvoiceMessage.attachmentMimetype)
 }
 inline std::string* InvoiceMessage::mutable_attachmentmimetype() {
@@ -28147,46 +29003,56 @@ inline std::string* InvoiceMessage::mutable_attachmentmimetype() {
   return _s;
 }
 inline const std::string& InvoiceMessage::_internal_attachmentmimetype() const {
-  return attachmentmimetype_.Get();
+  return _impl_.attachmentmimetype_.Get();
 }
 inline void InvoiceMessage::_internal_set_attachmentmimetype(const std::string& value) {
-  _has_bits_[0] |= 0x00000004u;
-  attachmentmimetype_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.attachmentmimetype_.Set(value, GetArenaForAllocation());
 }
 inline std::string* InvoiceMessage::_internal_mutable_attachmentmimetype() {
-  _has_bits_[0] |= 0x00000004u;
-  return attachmentmimetype_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  return _impl_.attachmentmimetype_.Mutable(GetArenaForAllocation());
 }
 inline std::string* InvoiceMessage::release_attachmentmimetype() {
   // @@protoc_insertion_point(field_release:proto.InvoiceMessage.attachmentMimetype)
   if (!_internal_has_attachmentmimetype()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000004u;
-  return attachmentmimetype_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  auto* p = _impl_.attachmentmimetype_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.attachmentmimetype_.IsDefault()) {
+    _impl_.attachmentmimetype_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void InvoiceMessage::set_allocated_attachmentmimetype(std::string* attachmentmimetype) {
   if (attachmentmimetype != nullptr) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
-  attachmentmimetype_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), attachmentmimetype,
-      GetArenaForAllocation());
+  _impl_.attachmentmimetype_.SetAllocated(attachmentmimetype, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.attachmentmimetype_.IsDefault()) {
+    _impl_.attachmentmimetype_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.InvoiceMessage.attachmentMimetype)
 }
 
 // optional bytes attachmentMediaKey = 5;
 inline bool InvoiceMessage::_internal_has_attachmentmediakey() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool InvoiceMessage::has_attachmentmediakey() const {
   return _internal_has_attachmentmediakey();
 }
 inline void InvoiceMessage::clear_attachmentmediakey() {
-  attachmentmediakey_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.attachmentmediakey_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline const std::string& InvoiceMessage::attachmentmediakey() const {
   // @@protoc_insertion_point(field_get:proto.InvoiceMessage.attachmentMediaKey)
@@ -28195,8 +29061,8 @@ inline const std::string& InvoiceMessage::attachmentmediakey() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void InvoiceMessage::set_attachmentmediakey(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000008u;
- attachmentmediakey_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000008u;
+ _impl_.attachmentmediakey_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.InvoiceMessage.attachmentMediaKey)
 }
 inline std::string* InvoiceMessage::mutable_attachmentmediakey() {
@@ -28205,74 +29071,84 @@ inline std::string* InvoiceMessage::mutable_attachmentmediakey() {
   return _s;
 }
 inline const std::string& InvoiceMessage::_internal_attachmentmediakey() const {
-  return attachmentmediakey_.Get();
+  return _impl_.attachmentmediakey_.Get();
 }
 inline void InvoiceMessage::_internal_set_attachmentmediakey(const std::string& value) {
-  _has_bits_[0] |= 0x00000008u;
-  attachmentmediakey_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.attachmentmediakey_.Set(value, GetArenaForAllocation());
 }
 inline std::string* InvoiceMessage::_internal_mutable_attachmentmediakey() {
-  _has_bits_[0] |= 0x00000008u;
-  return attachmentmediakey_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  return _impl_.attachmentmediakey_.Mutable(GetArenaForAllocation());
 }
 inline std::string* InvoiceMessage::release_attachmentmediakey() {
   // @@protoc_insertion_point(field_release:proto.InvoiceMessage.attachmentMediaKey)
   if (!_internal_has_attachmentmediakey()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000008u;
-  return attachmentmediakey_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  auto* p = _impl_.attachmentmediakey_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.attachmentmediakey_.IsDefault()) {
+    _impl_.attachmentmediakey_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void InvoiceMessage::set_allocated_attachmentmediakey(std::string* attachmentmediakey) {
   if (attachmentmediakey != nullptr) {
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
   }
-  attachmentmediakey_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), attachmentmediakey,
-      GetArenaForAllocation());
+  _impl_.attachmentmediakey_.SetAllocated(attachmentmediakey, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.attachmentmediakey_.IsDefault()) {
+    _impl_.attachmentmediakey_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.InvoiceMessage.attachmentMediaKey)
 }
 
 // optional int64 attachmentMediaKeyTimestamp = 6;
 inline bool InvoiceMessage::_internal_has_attachmentmediakeytimestamp() const {
-  bool value = (_has_bits_[0] & 0x00000100u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000100u) != 0;
   return value;
 }
 inline bool InvoiceMessage::has_attachmentmediakeytimestamp() const {
   return _internal_has_attachmentmediakeytimestamp();
 }
 inline void InvoiceMessage::clear_attachmentmediakeytimestamp() {
-  attachmentmediakeytimestamp_ = int64_t{0};
-  _has_bits_[0] &= ~0x00000100u;
+  _impl_.attachmentmediakeytimestamp_ = int64_t{0};
+  _impl_._has_bits_[0] &= ~0x00000100u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 InvoiceMessage::_internal_attachmentmediakeytimestamp() const {
-  return attachmentmediakeytimestamp_;
+inline int64_t InvoiceMessage::_internal_attachmentmediakeytimestamp() const {
+  return _impl_.attachmentmediakeytimestamp_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 InvoiceMessage::attachmentmediakeytimestamp() const {
+inline int64_t InvoiceMessage::attachmentmediakeytimestamp() const {
   // @@protoc_insertion_point(field_get:proto.InvoiceMessage.attachmentMediaKeyTimestamp)
   return _internal_attachmentmediakeytimestamp();
 }
-inline void InvoiceMessage::_internal_set_attachmentmediakeytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value) {
-  _has_bits_[0] |= 0x00000100u;
-  attachmentmediakeytimestamp_ = value;
+inline void InvoiceMessage::_internal_set_attachmentmediakeytimestamp(int64_t value) {
+  _impl_._has_bits_[0] |= 0x00000100u;
+  _impl_.attachmentmediakeytimestamp_ = value;
 }
-inline void InvoiceMessage::set_attachmentmediakeytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value) {
+inline void InvoiceMessage::set_attachmentmediakeytimestamp(int64_t value) {
   _internal_set_attachmentmediakeytimestamp(value);
   // @@protoc_insertion_point(field_set:proto.InvoiceMessage.attachmentMediaKeyTimestamp)
 }
 
 // optional bytes attachmentFileSha256 = 7;
 inline bool InvoiceMessage::_internal_has_attachmentfilesha256() const {
-  bool value = (_has_bits_[0] & 0x00000010u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
   return value;
 }
 inline bool InvoiceMessage::has_attachmentfilesha256() const {
   return _internal_has_attachmentfilesha256();
 }
 inline void InvoiceMessage::clear_attachmentfilesha256() {
-  attachmentfilesha256_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000010u;
+  _impl_.attachmentfilesha256_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000010u;
 }
 inline const std::string& InvoiceMessage::attachmentfilesha256() const {
   // @@protoc_insertion_point(field_get:proto.InvoiceMessage.attachmentFileSha256)
@@ -28281,8 +29157,8 @@ inline const std::string& InvoiceMessage::attachmentfilesha256() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void InvoiceMessage::set_attachmentfilesha256(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000010u;
- attachmentfilesha256_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000010u;
+ _impl_.attachmentfilesha256_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.InvoiceMessage.attachmentFileSha256)
 }
 inline std::string* InvoiceMessage::mutable_attachmentfilesha256() {
@@ -28291,46 +29167,56 @@ inline std::string* InvoiceMessage::mutable_attachmentfilesha256() {
   return _s;
 }
 inline const std::string& InvoiceMessage::_internal_attachmentfilesha256() const {
-  return attachmentfilesha256_.Get();
+  return _impl_.attachmentfilesha256_.Get();
 }
 inline void InvoiceMessage::_internal_set_attachmentfilesha256(const std::string& value) {
-  _has_bits_[0] |= 0x00000010u;
-  attachmentfilesha256_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  _impl_.attachmentfilesha256_.Set(value, GetArenaForAllocation());
 }
 inline std::string* InvoiceMessage::_internal_mutable_attachmentfilesha256() {
-  _has_bits_[0] |= 0x00000010u;
-  return attachmentfilesha256_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  return _impl_.attachmentfilesha256_.Mutable(GetArenaForAllocation());
 }
 inline std::string* InvoiceMessage::release_attachmentfilesha256() {
   // @@protoc_insertion_point(field_release:proto.InvoiceMessage.attachmentFileSha256)
   if (!_internal_has_attachmentfilesha256()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000010u;
-  return attachmentfilesha256_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000010u;
+  auto* p = _impl_.attachmentfilesha256_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.attachmentfilesha256_.IsDefault()) {
+    _impl_.attachmentfilesha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void InvoiceMessage::set_allocated_attachmentfilesha256(std::string* attachmentfilesha256) {
   if (attachmentfilesha256 != nullptr) {
-    _has_bits_[0] |= 0x00000010u;
+    _impl_._has_bits_[0] |= 0x00000010u;
   } else {
-    _has_bits_[0] &= ~0x00000010u;
+    _impl_._has_bits_[0] &= ~0x00000010u;
   }
-  attachmentfilesha256_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), attachmentfilesha256,
-      GetArenaForAllocation());
+  _impl_.attachmentfilesha256_.SetAllocated(attachmentfilesha256, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.attachmentfilesha256_.IsDefault()) {
+    _impl_.attachmentfilesha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.InvoiceMessage.attachmentFileSha256)
 }
 
 // optional bytes attachmentFileEncSha256 = 8;
 inline bool InvoiceMessage::_internal_has_attachmentfileencsha256() const {
-  bool value = (_has_bits_[0] & 0x00000020u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
   return value;
 }
 inline bool InvoiceMessage::has_attachmentfileencsha256() const {
   return _internal_has_attachmentfileencsha256();
 }
 inline void InvoiceMessage::clear_attachmentfileencsha256() {
-  attachmentfileencsha256_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000020u;
+  _impl_.attachmentfileencsha256_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000020u;
 }
 inline const std::string& InvoiceMessage::attachmentfileencsha256() const {
   // @@protoc_insertion_point(field_get:proto.InvoiceMessage.attachmentFileEncSha256)
@@ -28339,8 +29225,8 @@ inline const std::string& InvoiceMessage::attachmentfileencsha256() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void InvoiceMessage::set_attachmentfileencsha256(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000020u;
- attachmentfileencsha256_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000020u;
+ _impl_.attachmentfileencsha256_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.InvoiceMessage.attachmentFileEncSha256)
 }
 inline std::string* InvoiceMessage::mutable_attachmentfileencsha256() {
@@ -28349,46 +29235,56 @@ inline std::string* InvoiceMessage::mutable_attachmentfileencsha256() {
   return _s;
 }
 inline const std::string& InvoiceMessage::_internal_attachmentfileencsha256() const {
-  return attachmentfileencsha256_.Get();
+  return _impl_.attachmentfileencsha256_.Get();
 }
 inline void InvoiceMessage::_internal_set_attachmentfileencsha256(const std::string& value) {
-  _has_bits_[0] |= 0x00000020u;
-  attachmentfileencsha256_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000020u;
+  _impl_.attachmentfileencsha256_.Set(value, GetArenaForAllocation());
 }
 inline std::string* InvoiceMessage::_internal_mutable_attachmentfileencsha256() {
-  _has_bits_[0] |= 0x00000020u;
-  return attachmentfileencsha256_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000020u;
+  return _impl_.attachmentfileencsha256_.Mutable(GetArenaForAllocation());
 }
 inline std::string* InvoiceMessage::release_attachmentfileencsha256() {
   // @@protoc_insertion_point(field_release:proto.InvoiceMessage.attachmentFileEncSha256)
   if (!_internal_has_attachmentfileencsha256()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000020u;
-  return attachmentfileencsha256_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000020u;
+  auto* p = _impl_.attachmentfileencsha256_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.attachmentfileencsha256_.IsDefault()) {
+    _impl_.attachmentfileencsha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void InvoiceMessage::set_allocated_attachmentfileencsha256(std::string* attachmentfileencsha256) {
   if (attachmentfileencsha256 != nullptr) {
-    _has_bits_[0] |= 0x00000020u;
+    _impl_._has_bits_[0] |= 0x00000020u;
   } else {
-    _has_bits_[0] &= ~0x00000020u;
+    _impl_._has_bits_[0] &= ~0x00000020u;
   }
-  attachmentfileencsha256_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), attachmentfileencsha256,
-      GetArenaForAllocation());
+  _impl_.attachmentfileencsha256_.SetAllocated(attachmentfileencsha256, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.attachmentfileencsha256_.IsDefault()) {
+    _impl_.attachmentfileencsha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.InvoiceMessage.attachmentFileEncSha256)
 }
 
 // optional string attachmentDirectPath = 9;
 inline bool InvoiceMessage::_internal_has_attachmentdirectpath() const {
-  bool value = (_has_bits_[0] & 0x00000040u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
   return value;
 }
 inline bool InvoiceMessage::has_attachmentdirectpath() const {
   return _internal_has_attachmentdirectpath();
 }
 inline void InvoiceMessage::clear_attachmentdirectpath() {
-  attachmentdirectpath_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000040u;
+  _impl_.attachmentdirectpath_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000040u;
 }
 inline const std::string& InvoiceMessage::attachmentdirectpath() const {
   // @@protoc_insertion_point(field_get:proto.InvoiceMessage.attachmentDirectPath)
@@ -28397,8 +29293,8 @@ inline const std::string& InvoiceMessage::attachmentdirectpath() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void InvoiceMessage::set_attachmentdirectpath(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000040u;
- attachmentdirectpath_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000040u;
+ _impl_.attachmentdirectpath_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.InvoiceMessage.attachmentDirectPath)
 }
 inline std::string* InvoiceMessage::mutable_attachmentdirectpath() {
@@ -28407,46 +29303,56 @@ inline std::string* InvoiceMessage::mutable_attachmentdirectpath() {
   return _s;
 }
 inline const std::string& InvoiceMessage::_internal_attachmentdirectpath() const {
-  return attachmentdirectpath_.Get();
+  return _impl_.attachmentdirectpath_.Get();
 }
 inline void InvoiceMessage::_internal_set_attachmentdirectpath(const std::string& value) {
-  _has_bits_[0] |= 0x00000040u;
-  attachmentdirectpath_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000040u;
+  _impl_.attachmentdirectpath_.Set(value, GetArenaForAllocation());
 }
 inline std::string* InvoiceMessage::_internal_mutable_attachmentdirectpath() {
-  _has_bits_[0] |= 0x00000040u;
-  return attachmentdirectpath_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000040u;
+  return _impl_.attachmentdirectpath_.Mutable(GetArenaForAllocation());
 }
 inline std::string* InvoiceMessage::release_attachmentdirectpath() {
   // @@protoc_insertion_point(field_release:proto.InvoiceMessage.attachmentDirectPath)
   if (!_internal_has_attachmentdirectpath()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000040u;
-  return attachmentdirectpath_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000040u;
+  auto* p = _impl_.attachmentdirectpath_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.attachmentdirectpath_.IsDefault()) {
+    _impl_.attachmentdirectpath_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void InvoiceMessage::set_allocated_attachmentdirectpath(std::string* attachmentdirectpath) {
   if (attachmentdirectpath != nullptr) {
-    _has_bits_[0] |= 0x00000040u;
+    _impl_._has_bits_[0] |= 0x00000040u;
   } else {
-    _has_bits_[0] &= ~0x00000040u;
+    _impl_._has_bits_[0] &= ~0x00000040u;
   }
-  attachmentdirectpath_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), attachmentdirectpath,
-      GetArenaForAllocation());
+  _impl_.attachmentdirectpath_.SetAllocated(attachmentdirectpath, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.attachmentdirectpath_.IsDefault()) {
+    _impl_.attachmentdirectpath_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.InvoiceMessage.attachmentDirectPath)
 }
 
 // optional bytes attachmentJpegThumbnail = 10;
 inline bool InvoiceMessage::_internal_has_attachmentjpegthumbnail() const {
-  bool value = (_has_bits_[0] & 0x00000080u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000080u) != 0;
   return value;
 }
 inline bool InvoiceMessage::has_attachmentjpegthumbnail() const {
   return _internal_has_attachmentjpegthumbnail();
 }
 inline void InvoiceMessage::clear_attachmentjpegthumbnail() {
-  attachmentjpegthumbnail_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000080u;
+  _impl_.attachmentjpegthumbnail_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000080u;
 }
 inline const std::string& InvoiceMessage::attachmentjpegthumbnail() const {
   // @@protoc_insertion_point(field_get:proto.InvoiceMessage.attachmentJpegThumbnail)
@@ -28455,8 +29361,8 @@ inline const std::string& InvoiceMessage::attachmentjpegthumbnail() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void InvoiceMessage::set_attachmentjpegthumbnail(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000080u;
- attachmentjpegthumbnail_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000080u;
+ _impl_.attachmentjpegthumbnail_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.InvoiceMessage.attachmentJpegThumbnail)
 }
 inline std::string* InvoiceMessage::mutable_attachmentjpegthumbnail() {
@@ -28465,32 +29371,42 @@ inline std::string* InvoiceMessage::mutable_attachmentjpegthumbnail() {
   return _s;
 }
 inline const std::string& InvoiceMessage::_internal_attachmentjpegthumbnail() const {
-  return attachmentjpegthumbnail_.Get();
+  return _impl_.attachmentjpegthumbnail_.Get();
 }
 inline void InvoiceMessage::_internal_set_attachmentjpegthumbnail(const std::string& value) {
-  _has_bits_[0] |= 0x00000080u;
-  attachmentjpegthumbnail_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000080u;
+  _impl_.attachmentjpegthumbnail_.Set(value, GetArenaForAllocation());
 }
 inline std::string* InvoiceMessage::_internal_mutable_attachmentjpegthumbnail() {
-  _has_bits_[0] |= 0x00000080u;
-  return attachmentjpegthumbnail_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000080u;
+  return _impl_.attachmentjpegthumbnail_.Mutable(GetArenaForAllocation());
 }
 inline std::string* InvoiceMessage::release_attachmentjpegthumbnail() {
   // @@protoc_insertion_point(field_release:proto.InvoiceMessage.attachmentJpegThumbnail)
   if (!_internal_has_attachmentjpegthumbnail()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000080u;
-  return attachmentjpegthumbnail_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000080u;
+  auto* p = _impl_.attachmentjpegthumbnail_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.attachmentjpegthumbnail_.IsDefault()) {
+    _impl_.attachmentjpegthumbnail_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void InvoiceMessage::set_allocated_attachmentjpegthumbnail(std::string* attachmentjpegthumbnail) {
   if (attachmentjpegthumbnail != nullptr) {
-    _has_bits_[0] |= 0x00000080u;
+    _impl_._has_bits_[0] |= 0x00000080u;
   } else {
-    _has_bits_[0] &= ~0x00000080u;
+    _impl_._has_bits_[0] &= ~0x00000080u;
+  }
+  _impl_.attachmentjpegthumbnail_.SetAllocated(attachmentjpegthumbnail, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.attachmentjpegthumbnail_.IsDefault()) {
+    _impl_.attachmentjpegthumbnail_.Set("", GetArenaForAllocation());
   }
-  attachmentjpegthumbnail_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), attachmentjpegthumbnail,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.InvoiceMessage.attachmentJpegThumbnail)
 }
 
@@ -28500,15 +29416,15 @@ inline void InvoiceMessage::set_allocated_attachmentjpegthumbnail(std::string* a
 
 // optional string displayName = 1;
 inline bool ContactMessage::_internal_has_displayname() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool ContactMessage::has_displayname() const {
   return _internal_has_displayname();
 }
 inline void ContactMessage::clear_displayname() {
-  displayname_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.displayname_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& ContactMessage::displayname() const {
   // @@protoc_insertion_point(field_get:proto.ContactMessage.displayName)
@@ -28517,8 +29433,8 @@ inline const std::string& ContactMessage::displayname() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ContactMessage::set_displayname(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- displayname_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.displayname_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ContactMessage.displayName)
 }
 inline std::string* ContactMessage::mutable_displayname() {
@@ -28527,46 +29443,56 @@ inline std::string* ContactMessage::mutable_displayname() {
   return _s;
 }
 inline const std::string& ContactMessage::_internal_displayname() const {
-  return displayname_.Get();
+  return _impl_.displayname_.Get();
 }
 inline void ContactMessage::_internal_set_displayname(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  displayname_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.displayname_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ContactMessage::_internal_mutable_displayname() {
-  _has_bits_[0] |= 0x00000001u;
-  return displayname_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.displayname_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ContactMessage::release_displayname() {
   // @@protoc_insertion_point(field_release:proto.ContactMessage.displayName)
   if (!_internal_has_displayname()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return displayname_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.displayname_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.displayname_.IsDefault()) {
+    _impl_.displayname_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ContactMessage::set_allocated_displayname(std::string* displayname) {
   if (displayname != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
+  }
+  _impl_.displayname_.SetAllocated(displayname, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.displayname_.IsDefault()) {
+    _impl_.displayname_.Set("", GetArenaForAllocation());
   }
-  displayname_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), displayname,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ContactMessage.displayName)
 }
 
 // optional string vcard = 16;
 inline bool ContactMessage::_internal_has_vcard() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool ContactMessage::has_vcard() const {
   return _internal_has_vcard();
 }
 inline void ContactMessage::clear_vcard() {
-  vcard_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.vcard_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& ContactMessage::vcard() const {
   // @@protoc_insertion_point(field_get:proto.ContactMessage.vcard)
@@ -28575,8 +29501,8 @@ inline const std::string& ContactMessage::vcard() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ContactMessage::set_vcard(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- vcard_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.vcard_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ContactMessage.vcard)
 }
 inline std::string* ContactMessage::mutable_vcard() {
@@ -28585,50 +29511,60 @@ inline std::string* ContactMessage::mutable_vcard() {
   return _s;
 }
 inline const std::string& ContactMessage::_internal_vcard() const {
-  return vcard_.Get();
+  return _impl_.vcard_.Get();
 }
 inline void ContactMessage::_internal_set_vcard(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  vcard_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.vcard_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ContactMessage::_internal_mutable_vcard() {
-  _has_bits_[0] |= 0x00000002u;
-  return vcard_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.vcard_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ContactMessage::release_vcard() {
   // @@protoc_insertion_point(field_release:proto.ContactMessage.vcard)
   if (!_internal_has_vcard()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return vcard_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.vcard_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.vcard_.IsDefault()) {
+    _impl_.vcard_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ContactMessage::set_allocated_vcard(std::string* vcard) {
   if (vcard != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
+  }
+  _impl_.vcard_.SetAllocated(vcard, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.vcard_.IsDefault()) {
+    _impl_.vcard_.Set("", GetArenaForAllocation());
   }
-  vcard_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), vcard,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ContactMessage.vcard)
 }
 
 // optional .proto.ContextInfo contextInfo = 17;
 inline bool ContactMessage::_internal_has_contextinfo() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || contextinfo_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.contextinfo_ != nullptr);
   return value;
 }
 inline bool ContactMessage::has_contextinfo() const {
   return _internal_has_contextinfo();
 }
 inline void ContactMessage::clear_contextinfo() {
-  if (contextinfo_ != nullptr) contextinfo_->Clear();
-  _has_bits_[0] &= ~0x00000004u;
+  if (_impl_.contextinfo_ != nullptr) _impl_.contextinfo_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const ::proto::ContextInfo& ContactMessage::_internal_contextinfo() const {
-  const ::proto::ContextInfo* p = contextinfo_;
+  const ::proto::ContextInfo* p = _impl_.contextinfo_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ContextInfo&>(
       ::proto::_ContextInfo_default_instance_);
 }
@@ -28639,20 +29575,20 @@ inline const ::proto::ContextInfo& ContactMessage::contextinfo() const {
 inline void ContactMessage::unsafe_arena_set_allocated_contextinfo(
     ::proto::ContextInfo* contextinfo) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(contextinfo_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.contextinfo_);
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   if (contextinfo) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.ContactMessage.contextInfo)
 }
 inline ::proto::ContextInfo* ContactMessage::release_contextinfo() {
-  _has_bits_[0] &= ~0x00000004u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -28666,18 +29602,18 @@ inline ::proto::ContextInfo* ContactMessage::release_contextinfo() {
 }
 inline ::proto::ContextInfo* ContactMessage::unsafe_arena_release_contextinfo() {
   // @@protoc_insertion_point(field_release:proto.ContactMessage.contextInfo)
-  _has_bits_[0] &= ~0x00000004u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
   return temp;
 }
 inline ::proto::ContextInfo* ContactMessage::_internal_mutable_contextinfo() {
-  _has_bits_[0] |= 0x00000004u;
-  if (contextinfo_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000004u;
+  if (_impl_.contextinfo_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ContextInfo>(GetArenaForAllocation());
-    contextinfo_ = p;
+    _impl_.contextinfo_ = p;
   }
-  return contextinfo_;
+  return _impl_.contextinfo_;
 }
 inline ::proto::ContextInfo* ContactMessage::mutable_contextinfo() {
   ::proto::ContextInfo* _msg = _internal_mutable_contextinfo();
@@ -28687,20 +29623,20 @@ inline ::proto::ContextInfo* ContactMessage::mutable_contextinfo() {
 inline void ContactMessage::set_allocated_contextinfo(::proto::ContextInfo* contextinfo) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete contextinfo_;
+    delete _impl_.contextinfo_;
   }
   if (contextinfo) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ContextInfo>::GetOwningArena(contextinfo);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(contextinfo);
     if (message_arena != submessage_arena) {
       contextinfo = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, contextinfo, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   // @@protoc_insertion_point(field_set_allocated:proto.ContactMessage.contextInfo)
 }
 
@@ -28710,26 +29646,26 @@ inline void ContactMessage::set_allocated_contextinfo(::proto::ContextInfo* cont
 
 // optional double degreesLatitude = 1;
 inline bool LocationMessage::_internal_has_degreeslatitude() const {
-  bool value = (_has_bits_[0] & 0x00000040u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
   return value;
 }
 inline bool LocationMessage::has_degreeslatitude() const {
   return _internal_has_degreeslatitude();
 }
 inline void LocationMessage::clear_degreeslatitude() {
-  degreeslatitude_ = 0;
-  _has_bits_[0] &= ~0x00000040u;
+  _impl_.degreeslatitude_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000040u;
 }
 inline double LocationMessage::_internal_degreeslatitude() const {
-  return degreeslatitude_;
+  return _impl_.degreeslatitude_;
 }
 inline double LocationMessage::degreeslatitude() const {
   // @@protoc_insertion_point(field_get:proto.LocationMessage.degreesLatitude)
   return _internal_degreeslatitude();
 }
 inline void LocationMessage::_internal_set_degreeslatitude(double value) {
-  _has_bits_[0] |= 0x00000040u;
-  degreeslatitude_ = value;
+  _impl_._has_bits_[0] |= 0x00000040u;
+  _impl_.degreeslatitude_ = value;
 }
 inline void LocationMessage::set_degreeslatitude(double value) {
   _internal_set_degreeslatitude(value);
@@ -28738,26 +29674,26 @@ inline void LocationMessage::set_degreeslatitude(double value) {
 
 // optional double degreesLongitude = 2;
 inline bool LocationMessage::_internal_has_degreeslongitude() const {
-  bool value = (_has_bits_[0] & 0x00000080u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000080u) != 0;
   return value;
 }
 inline bool LocationMessage::has_degreeslongitude() const {
   return _internal_has_degreeslongitude();
 }
 inline void LocationMessage::clear_degreeslongitude() {
-  degreeslongitude_ = 0;
-  _has_bits_[0] &= ~0x00000080u;
+  _impl_.degreeslongitude_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000080u;
 }
 inline double LocationMessage::_internal_degreeslongitude() const {
-  return degreeslongitude_;
+  return _impl_.degreeslongitude_;
 }
 inline double LocationMessage::degreeslongitude() const {
   // @@protoc_insertion_point(field_get:proto.LocationMessage.degreesLongitude)
   return _internal_degreeslongitude();
 }
 inline void LocationMessage::_internal_set_degreeslongitude(double value) {
-  _has_bits_[0] |= 0x00000080u;
-  degreeslongitude_ = value;
+  _impl_._has_bits_[0] |= 0x00000080u;
+  _impl_.degreeslongitude_ = value;
 }
 inline void LocationMessage::set_degreeslongitude(double value) {
   _internal_set_degreeslongitude(value);
@@ -28766,15 +29702,15 @@ inline void LocationMessage::set_degreeslongitude(double value) {
 
 // optional string name = 3;
 inline bool LocationMessage::_internal_has_name() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool LocationMessage::has_name() const {
   return _internal_has_name();
 }
 inline void LocationMessage::clear_name() {
-  name_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.name_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& LocationMessage::name() const {
   // @@protoc_insertion_point(field_get:proto.LocationMessage.name)
@@ -28783,8 +29719,8 @@ inline const std::string& LocationMessage::name() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void LocationMessage::set_name(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.name_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.LocationMessage.name)
 }
 inline std::string* LocationMessage::mutable_name() {
@@ -28793,46 +29729,56 @@ inline std::string* LocationMessage::mutable_name() {
   return _s;
 }
 inline const std::string& LocationMessage::_internal_name() const {
-  return name_.Get();
+  return _impl_.name_.Get();
 }
 inline void LocationMessage::_internal_set_name(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  name_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.name_.Set(value, GetArenaForAllocation());
 }
 inline std::string* LocationMessage::_internal_mutable_name() {
-  _has_bits_[0] |= 0x00000001u;
-  return name_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.name_.Mutable(GetArenaForAllocation());
 }
 inline std::string* LocationMessage::release_name() {
   // @@protoc_insertion_point(field_release:proto.LocationMessage.name)
   if (!_internal_has_name()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return name_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.name_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.name_.IsDefault()) {
+    _impl_.name_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void LocationMessage::set_allocated_name(std::string* name) {
   if (name != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
+  }
+  _impl_.name_.SetAllocated(name, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.name_.IsDefault()) {
+    _impl_.name_.Set("", GetArenaForAllocation());
   }
-  name_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), name,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.LocationMessage.name)
 }
 
 // optional string address = 4;
 inline bool LocationMessage::_internal_has_address() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool LocationMessage::has_address() const {
   return _internal_has_address();
 }
 inline void LocationMessage::clear_address() {
-  address_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.address_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& LocationMessage::address() const {
   // @@protoc_insertion_point(field_get:proto.LocationMessage.address)
@@ -28841,8 +29787,8 @@ inline const std::string& LocationMessage::address() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void LocationMessage::set_address(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- address_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.address_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.LocationMessage.address)
 }
 inline std::string* LocationMessage::mutable_address() {
@@ -28851,46 +29797,56 @@ inline std::string* LocationMessage::mutable_address() {
   return _s;
 }
 inline const std::string& LocationMessage::_internal_address() const {
-  return address_.Get();
+  return _impl_.address_.Get();
 }
 inline void LocationMessage::_internal_set_address(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  address_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.address_.Set(value, GetArenaForAllocation());
 }
 inline std::string* LocationMessage::_internal_mutable_address() {
-  _has_bits_[0] |= 0x00000002u;
-  return address_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.address_.Mutable(GetArenaForAllocation());
 }
 inline std::string* LocationMessage::release_address() {
   // @@protoc_insertion_point(field_release:proto.LocationMessage.address)
   if (!_internal_has_address()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return address_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.address_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.address_.IsDefault()) {
+    _impl_.address_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void LocationMessage::set_allocated_address(std::string* address) {
   if (address != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
+  }
+  _impl_.address_.SetAllocated(address, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.address_.IsDefault()) {
+    _impl_.address_.Set("", GetArenaForAllocation());
   }
-  address_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), address,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.LocationMessage.address)
 }
 
 // optional string url = 5;
 inline bool LocationMessage::_internal_has_url() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool LocationMessage::has_url() const {
   return _internal_has_url();
 }
 inline void LocationMessage::clear_url() {
-  url_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.url_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const std::string& LocationMessage::url() const {
   // @@protoc_insertion_point(field_get:proto.LocationMessage.url)
@@ -28899,8 +29855,8 @@ inline const std::string& LocationMessage::url() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void LocationMessage::set_url(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000004u;
- url_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000004u;
+ _impl_.url_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.LocationMessage.url)
 }
 inline std::string* LocationMessage::mutable_url() {
@@ -28909,57 +29865,67 @@ inline std::string* LocationMessage::mutable_url() {
   return _s;
 }
 inline const std::string& LocationMessage::_internal_url() const {
-  return url_.Get();
+  return _impl_.url_.Get();
 }
 inline void LocationMessage::_internal_set_url(const std::string& value) {
-  _has_bits_[0] |= 0x00000004u;
-  url_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.url_.Set(value, GetArenaForAllocation());
 }
 inline std::string* LocationMessage::_internal_mutable_url() {
-  _has_bits_[0] |= 0x00000004u;
-  return url_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  return _impl_.url_.Mutable(GetArenaForAllocation());
 }
 inline std::string* LocationMessage::release_url() {
   // @@protoc_insertion_point(field_release:proto.LocationMessage.url)
   if (!_internal_has_url()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000004u;
-  return url_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  auto* p = _impl_.url_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.url_.IsDefault()) {
+    _impl_.url_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void LocationMessage::set_allocated_url(std::string* url) {
   if (url != nullptr) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
+  }
+  _impl_.url_.SetAllocated(url, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.url_.IsDefault()) {
+    _impl_.url_.Set("", GetArenaForAllocation());
   }
-  url_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), url,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.LocationMessage.url)
 }
 
 // optional bool isLive = 6;
 inline bool LocationMessage::_internal_has_islive() const {
-  bool value = (_has_bits_[0] & 0x00000100u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000100u) != 0;
   return value;
 }
 inline bool LocationMessage::has_islive() const {
   return _internal_has_islive();
 }
 inline void LocationMessage::clear_islive() {
-  islive_ = false;
-  _has_bits_[0] &= ~0x00000100u;
+  _impl_.islive_ = false;
+  _impl_._has_bits_[0] &= ~0x00000100u;
 }
 inline bool LocationMessage::_internal_islive() const {
-  return islive_;
+  return _impl_.islive_;
 }
 inline bool LocationMessage::islive() const {
   // @@protoc_insertion_point(field_get:proto.LocationMessage.isLive)
   return _internal_islive();
 }
 inline void LocationMessage::_internal_set_islive(bool value) {
-  _has_bits_[0] |= 0x00000100u;
-  islive_ = value;
+  _impl_._has_bits_[0] |= 0x00000100u;
+  _impl_.islive_ = value;
 }
 inline void LocationMessage::set_islive(bool value) {
   _internal_set_islive(value);
@@ -28968,54 +29934,54 @@ inline void LocationMessage::set_islive(bool value) {
 
 // optional uint32 accuracyInMeters = 7;
 inline bool LocationMessage::_internal_has_accuracyinmeters() const {
-  bool value = (_has_bits_[0] & 0x00000200u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000200u) != 0;
   return value;
 }
 inline bool LocationMessage::has_accuracyinmeters() const {
   return _internal_has_accuracyinmeters();
 }
 inline void LocationMessage::clear_accuracyinmeters() {
-  accuracyinmeters_ = 0u;
-  _has_bits_[0] &= ~0x00000200u;
+  _impl_.accuracyinmeters_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000200u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 LocationMessage::_internal_accuracyinmeters() const {
-  return accuracyinmeters_;
+inline uint32_t LocationMessage::_internal_accuracyinmeters() const {
+  return _impl_.accuracyinmeters_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 LocationMessage::accuracyinmeters() const {
+inline uint32_t LocationMessage::accuracyinmeters() const {
   // @@protoc_insertion_point(field_get:proto.LocationMessage.accuracyInMeters)
   return _internal_accuracyinmeters();
 }
-inline void LocationMessage::_internal_set_accuracyinmeters(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000200u;
-  accuracyinmeters_ = value;
+inline void LocationMessage::_internal_set_accuracyinmeters(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000200u;
+  _impl_.accuracyinmeters_ = value;
 }
-inline void LocationMessage::set_accuracyinmeters(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void LocationMessage::set_accuracyinmeters(uint32_t value) {
   _internal_set_accuracyinmeters(value);
   // @@protoc_insertion_point(field_set:proto.LocationMessage.accuracyInMeters)
 }
 
 // optional float speedInMps = 8;
 inline bool LocationMessage::_internal_has_speedinmps() const {
-  bool value = (_has_bits_[0] & 0x00000400u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000400u) != 0;
   return value;
 }
 inline bool LocationMessage::has_speedinmps() const {
   return _internal_has_speedinmps();
 }
 inline void LocationMessage::clear_speedinmps() {
-  speedinmps_ = 0;
-  _has_bits_[0] &= ~0x00000400u;
+  _impl_.speedinmps_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000400u;
 }
 inline float LocationMessage::_internal_speedinmps() const {
-  return speedinmps_;
+  return _impl_.speedinmps_;
 }
 inline float LocationMessage::speedinmps() const {
   // @@protoc_insertion_point(field_get:proto.LocationMessage.speedInMps)
   return _internal_speedinmps();
 }
 inline void LocationMessage::_internal_set_speedinmps(float value) {
-  _has_bits_[0] |= 0x00000400u;
-  speedinmps_ = value;
+  _impl_._has_bits_[0] |= 0x00000400u;
+  _impl_.speedinmps_ = value;
 }
 inline void LocationMessage::set_speedinmps(float value) {
   _internal_set_speedinmps(value);
@@ -29024,43 +29990,43 @@ inline void LocationMessage::set_speedinmps(float value) {
 
 // optional uint32 degreesClockwiseFromMagneticNorth = 9;
 inline bool LocationMessage::_internal_has_degreesclockwisefrommagneticnorth() const {
-  bool value = (_has_bits_[0] & 0x00000800u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000800u) != 0;
   return value;
 }
 inline bool LocationMessage::has_degreesclockwisefrommagneticnorth() const {
   return _internal_has_degreesclockwisefrommagneticnorth();
 }
 inline void LocationMessage::clear_degreesclockwisefrommagneticnorth() {
-  degreesclockwisefrommagneticnorth_ = 0u;
-  _has_bits_[0] &= ~0x00000800u;
+  _impl_.degreesclockwisefrommagneticnorth_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000800u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 LocationMessage::_internal_degreesclockwisefrommagneticnorth() const {
-  return degreesclockwisefrommagneticnorth_;
+inline uint32_t LocationMessage::_internal_degreesclockwisefrommagneticnorth() const {
+  return _impl_.degreesclockwisefrommagneticnorth_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 LocationMessage::degreesclockwisefrommagneticnorth() const {
+inline uint32_t LocationMessage::degreesclockwisefrommagneticnorth() const {
   // @@protoc_insertion_point(field_get:proto.LocationMessage.degreesClockwiseFromMagneticNorth)
   return _internal_degreesclockwisefrommagneticnorth();
 }
-inline void LocationMessage::_internal_set_degreesclockwisefrommagneticnorth(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000800u;
-  degreesclockwisefrommagneticnorth_ = value;
+inline void LocationMessage::_internal_set_degreesclockwisefrommagneticnorth(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000800u;
+  _impl_.degreesclockwisefrommagneticnorth_ = value;
 }
-inline void LocationMessage::set_degreesclockwisefrommagneticnorth(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void LocationMessage::set_degreesclockwisefrommagneticnorth(uint32_t value) {
   _internal_set_degreesclockwisefrommagneticnorth(value);
   // @@protoc_insertion_point(field_set:proto.LocationMessage.degreesClockwiseFromMagneticNorth)
 }
 
 // optional string comment = 11;
 inline bool LocationMessage::_internal_has_comment() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool LocationMessage::has_comment() const {
   return _internal_has_comment();
 }
 inline void LocationMessage::clear_comment() {
-  comment_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.comment_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline const std::string& LocationMessage::comment() const {
   // @@protoc_insertion_point(field_get:proto.LocationMessage.comment)
@@ -29069,8 +30035,8 @@ inline const std::string& LocationMessage::comment() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void LocationMessage::set_comment(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000008u;
- comment_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000008u;
+ _impl_.comment_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.LocationMessage.comment)
 }
 inline std::string* LocationMessage::mutable_comment() {
@@ -29079,46 +30045,56 @@ inline std::string* LocationMessage::mutable_comment() {
   return _s;
 }
 inline const std::string& LocationMessage::_internal_comment() const {
-  return comment_.Get();
+  return _impl_.comment_.Get();
 }
 inline void LocationMessage::_internal_set_comment(const std::string& value) {
-  _has_bits_[0] |= 0x00000008u;
-  comment_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.comment_.Set(value, GetArenaForAllocation());
 }
 inline std::string* LocationMessage::_internal_mutable_comment() {
-  _has_bits_[0] |= 0x00000008u;
-  return comment_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  return _impl_.comment_.Mutable(GetArenaForAllocation());
 }
 inline std::string* LocationMessage::release_comment() {
   // @@protoc_insertion_point(field_release:proto.LocationMessage.comment)
   if (!_internal_has_comment()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000008u;
-  return comment_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  auto* p = _impl_.comment_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.comment_.IsDefault()) {
+    _impl_.comment_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void LocationMessage::set_allocated_comment(std::string* comment) {
   if (comment != nullptr) {
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
+  }
+  _impl_.comment_.SetAllocated(comment, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.comment_.IsDefault()) {
+    _impl_.comment_.Set("", GetArenaForAllocation());
   }
-  comment_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), comment,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.LocationMessage.comment)
 }
 
 // optional bytes jpegThumbnail = 16;
 inline bool LocationMessage::_internal_has_jpegthumbnail() const {
-  bool value = (_has_bits_[0] & 0x00000010u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
   return value;
 }
 inline bool LocationMessage::has_jpegthumbnail() const {
   return _internal_has_jpegthumbnail();
 }
 inline void LocationMessage::clear_jpegthumbnail() {
-  jpegthumbnail_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000010u;
+  _impl_.jpegthumbnail_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000010u;
 }
 inline const std::string& LocationMessage::jpegthumbnail() const {
   // @@protoc_insertion_point(field_get:proto.LocationMessage.jpegThumbnail)
@@ -29127,8 +30103,8 @@ inline const std::string& LocationMessage::jpegthumbnail() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void LocationMessage::set_jpegthumbnail(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000010u;
- jpegthumbnail_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000010u;
+ _impl_.jpegthumbnail_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.LocationMessage.jpegThumbnail)
 }
 inline std::string* LocationMessage::mutable_jpegthumbnail() {
@@ -29137,50 +30113,60 @@ inline std::string* LocationMessage::mutable_jpegthumbnail() {
   return _s;
 }
 inline const std::string& LocationMessage::_internal_jpegthumbnail() const {
-  return jpegthumbnail_.Get();
+  return _impl_.jpegthumbnail_.Get();
 }
 inline void LocationMessage::_internal_set_jpegthumbnail(const std::string& value) {
-  _has_bits_[0] |= 0x00000010u;
-  jpegthumbnail_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  _impl_.jpegthumbnail_.Set(value, GetArenaForAllocation());
 }
 inline std::string* LocationMessage::_internal_mutable_jpegthumbnail() {
-  _has_bits_[0] |= 0x00000010u;
-  return jpegthumbnail_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  return _impl_.jpegthumbnail_.Mutable(GetArenaForAllocation());
 }
 inline std::string* LocationMessage::release_jpegthumbnail() {
   // @@protoc_insertion_point(field_release:proto.LocationMessage.jpegThumbnail)
   if (!_internal_has_jpegthumbnail()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000010u;
-  return jpegthumbnail_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000010u;
+  auto* p = _impl_.jpegthumbnail_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.jpegthumbnail_.IsDefault()) {
+    _impl_.jpegthumbnail_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void LocationMessage::set_allocated_jpegthumbnail(std::string* jpegthumbnail) {
   if (jpegthumbnail != nullptr) {
-    _has_bits_[0] |= 0x00000010u;
+    _impl_._has_bits_[0] |= 0x00000010u;
   } else {
-    _has_bits_[0] &= ~0x00000010u;
+    _impl_._has_bits_[0] &= ~0x00000010u;
+  }
+  _impl_.jpegthumbnail_.SetAllocated(jpegthumbnail, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.jpegthumbnail_.IsDefault()) {
+    _impl_.jpegthumbnail_.Set("", GetArenaForAllocation());
   }
-  jpegthumbnail_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), jpegthumbnail,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.LocationMessage.jpegThumbnail)
 }
 
 // optional .proto.ContextInfo contextInfo = 17;
 inline bool LocationMessage::_internal_has_contextinfo() const {
-  bool value = (_has_bits_[0] & 0x00000020u) != 0;
-  PROTOBUF_ASSUME(!value || contextinfo_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.contextinfo_ != nullptr);
   return value;
 }
 inline bool LocationMessage::has_contextinfo() const {
   return _internal_has_contextinfo();
 }
 inline void LocationMessage::clear_contextinfo() {
-  if (contextinfo_ != nullptr) contextinfo_->Clear();
-  _has_bits_[0] &= ~0x00000020u;
+  if (_impl_.contextinfo_ != nullptr) _impl_.contextinfo_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000020u;
 }
 inline const ::proto::ContextInfo& LocationMessage::_internal_contextinfo() const {
-  const ::proto::ContextInfo* p = contextinfo_;
+  const ::proto::ContextInfo* p = _impl_.contextinfo_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ContextInfo&>(
       ::proto::_ContextInfo_default_instance_);
 }
@@ -29191,20 +30177,20 @@ inline const ::proto::ContextInfo& LocationMessage::contextinfo() const {
 inline void LocationMessage::unsafe_arena_set_allocated_contextinfo(
     ::proto::ContextInfo* contextinfo) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(contextinfo_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.contextinfo_);
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   if (contextinfo) {
-    _has_bits_[0] |= 0x00000020u;
+    _impl_._has_bits_[0] |= 0x00000020u;
   } else {
-    _has_bits_[0] &= ~0x00000020u;
+    _impl_._has_bits_[0] &= ~0x00000020u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.LocationMessage.contextInfo)
 }
 inline ::proto::ContextInfo* LocationMessage::release_contextinfo() {
-  _has_bits_[0] &= ~0x00000020u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000020u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -29218,18 +30204,18 @@ inline ::proto::ContextInfo* LocationMessage::release_contextinfo() {
 }
 inline ::proto::ContextInfo* LocationMessage::unsafe_arena_release_contextinfo() {
   // @@protoc_insertion_point(field_release:proto.LocationMessage.contextInfo)
-  _has_bits_[0] &= ~0x00000020u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000020u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
   return temp;
 }
 inline ::proto::ContextInfo* LocationMessage::_internal_mutable_contextinfo() {
-  _has_bits_[0] |= 0x00000020u;
-  if (contextinfo_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000020u;
+  if (_impl_.contextinfo_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ContextInfo>(GetArenaForAllocation());
-    contextinfo_ = p;
+    _impl_.contextinfo_ = p;
   }
-  return contextinfo_;
+  return _impl_.contextinfo_;
 }
 inline ::proto::ContextInfo* LocationMessage::mutable_contextinfo() {
   ::proto::ContextInfo* _msg = _internal_mutable_contextinfo();
@@ -29239,20 +30225,20 @@ inline ::proto::ContextInfo* LocationMessage::mutable_contextinfo() {
 inline void LocationMessage::set_allocated_contextinfo(::proto::ContextInfo* contextinfo) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete contextinfo_;
+    delete _impl_.contextinfo_;
   }
   if (contextinfo) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ContextInfo>::GetOwningArena(contextinfo);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(contextinfo);
     if (message_arena != submessage_arena) {
       contextinfo = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, contextinfo, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000020u;
+    _impl_._has_bits_[0] |= 0x00000020u;
   } else {
-    _has_bits_[0] &= ~0x00000020u;
+    _impl_._has_bits_[0] &= ~0x00000020u;
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   // @@protoc_insertion_point(field_set_allocated:proto.LocationMessage.contextInfo)
 }
 
@@ -29262,15 +30248,15 @@ inline void LocationMessage::set_allocated_contextinfo(::proto::ContextInfo* con
 
 // optional string text = 1;
 inline bool ExtendedTextMessage::_internal_has_text() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool ExtendedTextMessage::has_text() const {
   return _internal_has_text();
 }
 inline void ExtendedTextMessage::clear_text() {
-  text_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.text_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& ExtendedTextMessage::text() const {
   // @@protoc_insertion_point(field_get:proto.ExtendedTextMessage.text)
@@ -29279,8 +30265,8 @@ inline const std::string& ExtendedTextMessage::text() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ExtendedTextMessage::set_text(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- text_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.text_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ExtendedTextMessage.text)
 }
 inline std::string* ExtendedTextMessage::mutable_text() {
@@ -29289,46 +30275,56 @@ inline std::string* ExtendedTextMessage::mutable_text() {
   return _s;
 }
 inline const std::string& ExtendedTextMessage::_internal_text() const {
-  return text_.Get();
+  return _impl_.text_.Get();
 }
 inline void ExtendedTextMessage::_internal_set_text(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  text_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.text_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ExtendedTextMessage::_internal_mutable_text() {
-  _has_bits_[0] |= 0x00000001u;
-  return text_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.text_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ExtendedTextMessage::release_text() {
   // @@protoc_insertion_point(field_release:proto.ExtendedTextMessage.text)
   if (!_internal_has_text()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return text_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.text_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.text_.IsDefault()) {
+    _impl_.text_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ExtendedTextMessage::set_allocated_text(std::string* text) {
   if (text != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  text_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), text,
-      GetArenaForAllocation());
+  _impl_.text_.SetAllocated(text, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.text_.IsDefault()) {
+    _impl_.text_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ExtendedTextMessage.text)
 }
 
 // optional string matchedText = 2;
 inline bool ExtendedTextMessage::_internal_has_matchedtext() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool ExtendedTextMessage::has_matchedtext() const {
   return _internal_has_matchedtext();
 }
 inline void ExtendedTextMessage::clear_matchedtext() {
-  matchedtext_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.matchedtext_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& ExtendedTextMessage::matchedtext() const {
   // @@protoc_insertion_point(field_get:proto.ExtendedTextMessage.matchedText)
@@ -29337,8 +30333,8 @@ inline const std::string& ExtendedTextMessage::matchedtext() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ExtendedTextMessage::set_matchedtext(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- matchedtext_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.matchedtext_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ExtendedTextMessage.matchedText)
 }
 inline std::string* ExtendedTextMessage::mutable_matchedtext() {
@@ -29347,46 +30343,56 @@ inline std::string* ExtendedTextMessage::mutable_matchedtext() {
   return _s;
 }
 inline const std::string& ExtendedTextMessage::_internal_matchedtext() const {
-  return matchedtext_.Get();
+  return _impl_.matchedtext_.Get();
 }
 inline void ExtendedTextMessage::_internal_set_matchedtext(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  matchedtext_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.matchedtext_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ExtendedTextMessage::_internal_mutable_matchedtext() {
-  _has_bits_[0] |= 0x00000002u;
-  return matchedtext_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.matchedtext_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ExtendedTextMessage::release_matchedtext() {
   // @@protoc_insertion_point(field_release:proto.ExtendedTextMessage.matchedText)
   if (!_internal_has_matchedtext()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return matchedtext_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.matchedtext_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.matchedtext_.IsDefault()) {
+    _impl_.matchedtext_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ExtendedTextMessage::set_allocated_matchedtext(std::string* matchedtext) {
   if (matchedtext != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  matchedtext_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), matchedtext,
-      GetArenaForAllocation());
+  _impl_.matchedtext_.SetAllocated(matchedtext, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.matchedtext_.IsDefault()) {
+    _impl_.matchedtext_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ExtendedTextMessage.matchedText)
 }
 
 // optional string canonicalUrl = 4;
 inline bool ExtendedTextMessage::_internal_has_canonicalurl() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool ExtendedTextMessage::has_canonicalurl() const {
   return _internal_has_canonicalurl();
 }
 inline void ExtendedTextMessage::clear_canonicalurl() {
-  canonicalurl_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.canonicalurl_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const std::string& ExtendedTextMessage::canonicalurl() const {
   // @@protoc_insertion_point(field_get:proto.ExtendedTextMessage.canonicalUrl)
@@ -29395,8 +30401,8 @@ inline const std::string& ExtendedTextMessage::canonicalurl() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ExtendedTextMessage::set_canonicalurl(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000004u;
- canonicalurl_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000004u;
+ _impl_.canonicalurl_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ExtendedTextMessage.canonicalUrl)
 }
 inline std::string* ExtendedTextMessage::mutable_canonicalurl() {
@@ -29405,46 +30411,56 @@ inline std::string* ExtendedTextMessage::mutable_canonicalurl() {
   return _s;
 }
 inline const std::string& ExtendedTextMessage::_internal_canonicalurl() const {
-  return canonicalurl_.Get();
+  return _impl_.canonicalurl_.Get();
 }
 inline void ExtendedTextMessage::_internal_set_canonicalurl(const std::string& value) {
-  _has_bits_[0] |= 0x00000004u;
-  canonicalurl_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.canonicalurl_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ExtendedTextMessage::_internal_mutable_canonicalurl() {
-  _has_bits_[0] |= 0x00000004u;
-  return canonicalurl_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  return _impl_.canonicalurl_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ExtendedTextMessage::release_canonicalurl() {
   // @@protoc_insertion_point(field_release:proto.ExtendedTextMessage.canonicalUrl)
   if (!_internal_has_canonicalurl()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000004u;
-  return canonicalurl_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  auto* p = _impl_.canonicalurl_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.canonicalurl_.IsDefault()) {
+    _impl_.canonicalurl_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ExtendedTextMessage::set_allocated_canonicalurl(std::string* canonicalurl) {
   if (canonicalurl != nullptr) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
-  canonicalurl_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), canonicalurl,
-      GetArenaForAllocation());
+  _impl_.canonicalurl_.SetAllocated(canonicalurl, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.canonicalurl_.IsDefault()) {
+    _impl_.canonicalurl_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ExtendedTextMessage.canonicalUrl)
 }
 
 // optional string description = 5;
 inline bool ExtendedTextMessage::_internal_has_description() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool ExtendedTextMessage::has_description() const {
   return _internal_has_description();
 }
 inline void ExtendedTextMessage::clear_description() {
-  description_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.description_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline const std::string& ExtendedTextMessage::description() const {
   // @@protoc_insertion_point(field_get:proto.ExtendedTextMessage.description)
@@ -29453,8 +30469,8 @@ inline const std::string& ExtendedTextMessage::description() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ExtendedTextMessage::set_description(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000008u;
- description_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000008u;
+ _impl_.description_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ExtendedTextMessage.description)
 }
 inline std::string* ExtendedTextMessage::mutable_description() {
@@ -29463,46 +30479,56 @@ inline std::string* ExtendedTextMessage::mutable_description() {
   return _s;
 }
 inline const std::string& ExtendedTextMessage::_internal_description() const {
-  return description_.Get();
+  return _impl_.description_.Get();
 }
 inline void ExtendedTextMessage::_internal_set_description(const std::string& value) {
-  _has_bits_[0] |= 0x00000008u;
-  description_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.description_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ExtendedTextMessage::_internal_mutable_description() {
-  _has_bits_[0] |= 0x00000008u;
-  return description_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  return _impl_.description_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ExtendedTextMessage::release_description() {
   // @@protoc_insertion_point(field_release:proto.ExtendedTextMessage.description)
   if (!_internal_has_description()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000008u;
-  return description_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  auto* p = _impl_.description_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.description_.IsDefault()) {
+    _impl_.description_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ExtendedTextMessage::set_allocated_description(std::string* description) {
   if (description != nullptr) {
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
+  }
+  _impl_.description_.SetAllocated(description, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.description_.IsDefault()) {
+    _impl_.description_.Set("", GetArenaForAllocation());
   }
-  description_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), description,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ExtendedTextMessage.description)
 }
 
 // optional string title = 6;
 inline bool ExtendedTextMessage::_internal_has_title() const {
-  bool value = (_has_bits_[0] & 0x00000010u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
   return value;
 }
 inline bool ExtendedTextMessage::has_title() const {
   return _internal_has_title();
 }
 inline void ExtendedTextMessage::clear_title() {
-  title_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000010u;
+  _impl_.title_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000010u;
 }
 inline const std::string& ExtendedTextMessage::title() const {
   // @@protoc_insertion_point(field_get:proto.ExtendedTextMessage.title)
@@ -29511,8 +30537,8 @@ inline const std::string& ExtendedTextMessage::title() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ExtendedTextMessage::set_title(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000010u;
- title_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000010u;
+ _impl_.title_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ExtendedTextMessage.title)
 }
 inline std::string* ExtendedTextMessage::mutable_title() {
@@ -29521,105 +30547,115 @@ inline std::string* ExtendedTextMessage::mutable_title() {
   return _s;
 }
 inline const std::string& ExtendedTextMessage::_internal_title() const {
-  return title_.Get();
+  return _impl_.title_.Get();
 }
 inline void ExtendedTextMessage::_internal_set_title(const std::string& value) {
-  _has_bits_[0] |= 0x00000010u;
-  title_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  _impl_.title_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ExtendedTextMessage::_internal_mutable_title() {
-  _has_bits_[0] |= 0x00000010u;
-  return title_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  return _impl_.title_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ExtendedTextMessage::release_title() {
   // @@protoc_insertion_point(field_release:proto.ExtendedTextMessage.title)
   if (!_internal_has_title()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000010u;
-  return title_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000010u;
+  auto* p = _impl_.title_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.title_.IsDefault()) {
+    _impl_.title_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ExtendedTextMessage::set_allocated_title(std::string* title) {
   if (title != nullptr) {
-    _has_bits_[0] |= 0x00000010u;
+    _impl_._has_bits_[0] |= 0x00000010u;
   } else {
-    _has_bits_[0] &= ~0x00000010u;
+    _impl_._has_bits_[0] &= ~0x00000010u;
+  }
+  _impl_.title_.SetAllocated(title, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.title_.IsDefault()) {
+    _impl_.title_.Set("", GetArenaForAllocation());
   }
-  title_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), title,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ExtendedTextMessage.title)
 }
 
 // optional fixed32 textArgb = 7;
 inline bool ExtendedTextMessage::_internal_has_textargb() const {
-  bool value = (_has_bits_[0] & 0x00000080u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000080u) != 0;
   return value;
 }
 inline bool ExtendedTextMessage::has_textargb() const {
   return _internal_has_textargb();
 }
 inline void ExtendedTextMessage::clear_textargb() {
-  textargb_ = 0u;
-  _has_bits_[0] &= ~0x00000080u;
+  _impl_.textargb_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000080u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 ExtendedTextMessage::_internal_textargb() const {
-  return textargb_;
+inline uint32_t ExtendedTextMessage::_internal_textargb() const {
+  return _impl_.textargb_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 ExtendedTextMessage::textargb() const {
+inline uint32_t ExtendedTextMessage::textargb() const {
   // @@protoc_insertion_point(field_get:proto.ExtendedTextMessage.textArgb)
   return _internal_textargb();
 }
-inline void ExtendedTextMessage::_internal_set_textargb(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000080u;
-  textargb_ = value;
+inline void ExtendedTextMessage::_internal_set_textargb(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000080u;
+  _impl_.textargb_ = value;
 }
-inline void ExtendedTextMessage::set_textargb(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void ExtendedTextMessage::set_textargb(uint32_t value) {
   _internal_set_textargb(value);
   // @@protoc_insertion_point(field_set:proto.ExtendedTextMessage.textArgb)
 }
 
 // optional fixed32 backgroundArgb = 8;
 inline bool ExtendedTextMessage::_internal_has_backgroundargb() const {
-  bool value = (_has_bits_[0] & 0x00000100u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000100u) != 0;
   return value;
 }
 inline bool ExtendedTextMessage::has_backgroundargb() const {
   return _internal_has_backgroundargb();
 }
 inline void ExtendedTextMessage::clear_backgroundargb() {
-  backgroundargb_ = 0u;
-  _has_bits_[0] &= ~0x00000100u;
+  _impl_.backgroundargb_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000100u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 ExtendedTextMessage::_internal_backgroundargb() const {
-  return backgroundargb_;
+inline uint32_t ExtendedTextMessage::_internal_backgroundargb() const {
+  return _impl_.backgroundargb_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 ExtendedTextMessage::backgroundargb() const {
+inline uint32_t ExtendedTextMessage::backgroundargb() const {
   // @@protoc_insertion_point(field_get:proto.ExtendedTextMessage.backgroundArgb)
   return _internal_backgroundargb();
 }
-inline void ExtendedTextMessage::_internal_set_backgroundargb(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000100u;
-  backgroundargb_ = value;
+inline void ExtendedTextMessage::_internal_set_backgroundargb(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000100u;
+  _impl_.backgroundargb_ = value;
 }
-inline void ExtendedTextMessage::set_backgroundargb(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void ExtendedTextMessage::set_backgroundargb(uint32_t value) {
   _internal_set_backgroundargb(value);
   // @@protoc_insertion_point(field_set:proto.ExtendedTextMessage.backgroundArgb)
 }
 
 // optional .proto.ExtendedTextMessage.ExtendedTextMessageFontType font = 9;
 inline bool ExtendedTextMessage::_internal_has_font() const {
-  bool value = (_has_bits_[0] & 0x00000200u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000200u) != 0;
   return value;
 }
 inline bool ExtendedTextMessage::has_font() const {
   return _internal_has_font();
 }
 inline void ExtendedTextMessage::clear_font() {
-  font_ = 0;
-  _has_bits_[0] &= ~0x00000200u;
+  _impl_.font_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000200u;
 }
 inline ::proto::ExtendedTextMessage_ExtendedTextMessageFontType ExtendedTextMessage::_internal_font() const {
-  return static_cast< ::proto::ExtendedTextMessage_ExtendedTextMessageFontType >(font_);
+  return static_cast< ::proto::ExtendedTextMessage_ExtendedTextMessageFontType >(_impl_.font_);
 }
 inline ::proto::ExtendedTextMessage_ExtendedTextMessageFontType ExtendedTextMessage::font() const {
   // @@protoc_insertion_point(field_get:proto.ExtendedTextMessage.font)
@@ -29627,8 +30663,8 @@ inline ::proto::ExtendedTextMessage_ExtendedTextMessageFontType ExtendedTextMess
 }
 inline void ExtendedTextMessage::_internal_set_font(::proto::ExtendedTextMessage_ExtendedTextMessageFontType value) {
   assert(::proto::ExtendedTextMessage_ExtendedTextMessageFontType_IsValid(value));
-  _has_bits_[0] |= 0x00000200u;
-  font_ = value;
+  _impl_._has_bits_[0] |= 0x00000200u;
+  _impl_.font_ = value;
 }
 inline void ExtendedTextMessage::set_font(::proto::ExtendedTextMessage_ExtendedTextMessageFontType value) {
   _internal_set_font(value);
@@ -29637,18 +30673,18 @@ inline void ExtendedTextMessage::set_font(::proto::ExtendedTextMessage_ExtendedT
 
 // optional .proto.ExtendedTextMessage.ExtendedTextMessagePreviewType previewType = 10;
 inline bool ExtendedTextMessage::_internal_has_previewtype() const {
-  bool value = (_has_bits_[0] & 0x00000400u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000400u) != 0;
   return value;
 }
 inline bool ExtendedTextMessage::has_previewtype() const {
   return _internal_has_previewtype();
 }
 inline void ExtendedTextMessage::clear_previewtype() {
-  previewtype_ = 0;
-  _has_bits_[0] &= ~0x00000400u;
+  _impl_.previewtype_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000400u;
 }
 inline ::proto::ExtendedTextMessage_ExtendedTextMessagePreviewType ExtendedTextMessage::_internal_previewtype() const {
-  return static_cast< ::proto::ExtendedTextMessage_ExtendedTextMessagePreviewType >(previewtype_);
+  return static_cast< ::proto::ExtendedTextMessage_ExtendedTextMessagePreviewType >(_impl_.previewtype_);
 }
 inline ::proto::ExtendedTextMessage_ExtendedTextMessagePreviewType ExtendedTextMessage::previewtype() const {
   // @@protoc_insertion_point(field_get:proto.ExtendedTextMessage.previewType)
@@ -29656,8 +30692,8 @@ inline ::proto::ExtendedTextMessage_ExtendedTextMessagePreviewType ExtendedTextM
 }
 inline void ExtendedTextMessage::_internal_set_previewtype(::proto::ExtendedTextMessage_ExtendedTextMessagePreviewType value) {
   assert(::proto::ExtendedTextMessage_ExtendedTextMessagePreviewType_IsValid(value));
-  _has_bits_[0] |= 0x00000400u;
-  previewtype_ = value;
+  _impl_._has_bits_[0] |= 0x00000400u;
+  _impl_.previewtype_ = value;
 }
 inline void ExtendedTextMessage::set_previewtype(::proto::ExtendedTextMessage_ExtendedTextMessagePreviewType value) {
   _internal_set_previewtype(value);
@@ -29666,15 +30702,15 @@ inline void ExtendedTextMessage::set_previewtype(::proto::ExtendedTextMessage_Ex
 
 // optional bytes jpegThumbnail = 16;
 inline bool ExtendedTextMessage::_internal_has_jpegthumbnail() const {
-  bool value = (_has_bits_[0] & 0x00000020u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
   return value;
 }
 inline bool ExtendedTextMessage::has_jpegthumbnail() const {
   return _internal_has_jpegthumbnail();
 }
 inline void ExtendedTextMessage::clear_jpegthumbnail() {
-  jpegthumbnail_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000020u;
+  _impl_.jpegthumbnail_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000020u;
 }
 inline const std::string& ExtendedTextMessage::jpegthumbnail() const {
   // @@protoc_insertion_point(field_get:proto.ExtendedTextMessage.jpegThumbnail)
@@ -29683,8 +30719,8 @@ inline const std::string& ExtendedTextMessage::jpegthumbnail() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ExtendedTextMessage::set_jpegthumbnail(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000020u;
- jpegthumbnail_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000020u;
+ _impl_.jpegthumbnail_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ExtendedTextMessage.jpegThumbnail)
 }
 inline std::string* ExtendedTextMessage::mutable_jpegthumbnail() {
@@ -29693,50 +30729,60 @@ inline std::string* ExtendedTextMessage::mutable_jpegthumbnail() {
   return _s;
 }
 inline const std::string& ExtendedTextMessage::_internal_jpegthumbnail() const {
-  return jpegthumbnail_.Get();
+  return _impl_.jpegthumbnail_.Get();
 }
 inline void ExtendedTextMessage::_internal_set_jpegthumbnail(const std::string& value) {
-  _has_bits_[0] |= 0x00000020u;
-  jpegthumbnail_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000020u;
+  _impl_.jpegthumbnail_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ExtendedTextMessage::_internal_mutable_jpegthumbnail() {
-  _has_bits_[0] |= 0x00000020u;
-  return jpegthumbnail_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000020u;
+  return _impl_.jpegthumbnail_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ExtendedTextMessage::release_jpegthumbnail() {
   // @@protoc_insertion_point(field_release:proto.ExtendedTextMessage.jpegThumbnail)
   if (!_internal_has_jpegthumbnail()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000020u;
-  return jpegthumbnail_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000020u;
+  auto* p = _impl_.jpegthumbnail_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.jpegthumbnail_.IsDefault()) {
+    _impl_.jpegthumbnail_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ExtendedTextMessage::set_allocated_jpegthumbnail(std::string* jpegthumbnail) {
   if (jpegthumbnail != nullptr) {
-    _has_bits_[0] |= 0x00000020u;
+    _impl_._has_bits_[0] |= 0x00000020u;
   } else {
-    _has_bits_[0] &= ~0x00000020u;
+    _impl_._has_bits_[0] &= ~0x00000020u;
+  }
+  _impl_.jpegthumbnail_.SetAllocated(jpegthumbnail, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.jpegthumbnail_.IsDefault()) {
+    _impl_.jpegthumbnail_.Set("", GetArenaForAllocation());
   }
-  jpegthumbnail_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), jpegthumbnail,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ExtendedTextMessage.jpegThumbnail)
 }
 
 // optional .proto.ContextInfo contextInfo = 17;
 inline bool ExtendedTextMessage::_internal_has_contextinfo() const {
-  bool value = (_has_bits_[0] & 0x00000040u) != 0;
-  PROTOBUF_ASSUME(!value || contextinfo_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.contextinfo_ != nullptr);
   return value;
 }
 inline bool ExtendedTextMessage::has_contextinfo() const {
   return _internal_has_contextinfo();
 }
 inline void ExtendedTextMessage::clear_contextinfo() {
-  if (contextinfo_ != nullptr) contextinfo_->Clear();
-  _has_bits_[0] &= ~0x00000040u;
+  if (_impl_.contextinfo_ != nullptr) _impl_.contextinfo_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000040u;
 }
 inline const ::proto::ContextInfo& ExtendedTextMessage::_internal_contextinfo() const {
-  const ::proto::ContextInfo* p = contextinfo_;
+  const ::proto::ContextInfo* p = _impl_.contextinfo_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ContextInfo&>(
       ::proto::_ContextInfo_default_instance_);
 }
@@ -29747,20 +30793,20 @@ inline const ::proto::ContextInfo& ExtendedTextMessage::contextinfo() const {
 inline void ExtendedTextMessage::unsafe_arena_set_allocated_contextinfo(
     ::proto::ContextInfo* contextinfo) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(contextinfo_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.contextinfo_);
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   if (contextinfo) {
-    _has_bits_[0] |= 0x00000040u;
+    _impl_._has_bits_[0] |= 0x00000040u;
   } else {
-    _has_bits_[0] &= ~0x00000040u;
+    _impl_._has_bits_[0] &= ~0x00000040u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.ExtendedTextMessage.contextInfo)
 }
 inline ::proto::ContextInfo* ExtendedTextMessage::release_contextinfo() {
-  _has_bits_[0] &= ~0x00000040u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000040u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -29774,18 +30820,18 @@ inline ::proto::ContextInfo* ExtendedTextMessage::release_contextinfo() {
 }
 inline ::proto::ContextInfo* ExtendedTextMessage::unsafe_arena_release_contextinfo() {
   // @@protoc_insertion_point(field_release:proto.ExtendedTextMessage.contextInfo)
-  _has_bits_[0] &= ~0x00000040u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000040u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
   return temp;
 }
 inline ::proto::ContextInfo* ExtendedTextMessage::_internal_mutable_contextinfo() {
-  _has_bits_[0] |= 0x00000040u;
-  if (contextinfo_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000040u;
+  if (_impl_.contextinfo_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ContextInfo>(GetArenaForAllocation());
-    contextinfo_ = p;
+    _impl_.contextinfo_ = p;
   }
-  return contextinfo_;
+  return _impl_.contextinfo_;
 }
 inline ::proto::ContextInfo* ExtendedTextMessage::mutable_contextinfo() {
   ::proto::ContextInfo* _msg = _internal_mutable_contextinfo();
@@ -29795,45 +30841,45 @@ inline ::proto::ContextInfo* ExtendedTextMessage::mutable_contextinfo() {
 inline void ExtendedTextMessage::set_allocated_contextinfo(::proto::ContextInfo* contextinfo) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete contextinfo_;
+    delete _impl_.contextinfo_;
   }
   if (contextinfo) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ContextInfo>::GetOwningArena(contextinfo);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(contextinfo);
     if (message_arena != submessage_arena) {
       contextinfo = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, contextinfo, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000040u;
+    _impl_._has_bits_[0] |= 0x00000040u;
   } else {
-    _has_bits_[0] &= ~0x00000040u;
+    _impl_._has_bits_[0] &= ~0x00000040u;
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   // @@protoc_insertion_point(field_set_allocated:proto.ExtendedTextMessage.contextInfo)
 }
 
 // optional bool doNotPlayInline = 18;
 inline bool ExtendedTextMessage::_internal_has_donotplayinline() const {
-  bool value = (_has_bits_[0] & 0x00000800u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000800u) != 0;
   return value;
 }
 inline bool ExtendedTextMessage::has_donotplayinline() const {
   return _internal_has_donotplayinline();
 }
 inline void ExtendedTextMessage::clear_donotplayinline() {
-  donotplayinline_ = false;
-  _has_bits_[0] &= ~0x00000800u;
+  _impl_.donotplayinline_ = false;
+  _impl_._has_bits_[0] &= ~0x00000800u;
 }
 inline bool ExtendedTextMessage::_internal_donotplayinline() const {
-  return donotplayinline_;
+  return _impl_.donotplayinline_;
 }
 inline bool ExtendedTextMessage::donotplayinline() const {
   // @@protoc_insertion_point(field_get:proto.ExtendedTextMessage.doNotPlayInline)
   return _internal_donotplayinline();
 }
 inline void ExtendedTextMessage::_internal_set_donotplayinline(bool value) {
-  _has_bits_[0] |= 0x00000800u;
-  donotplayinline_ = value;
+  _impl_._has_bits_[0] |= 0x00000800u;
+  _impl_.donotplayinline_ = value;
 }
 inline void ExtendedTextMessage::set_donotplayinline(bool value) {
   _internal_set_donotplayinline(value);
@@ -29846,15 +30892,15 @@ inline void ExtendedTextMessage::set_donotplayinline(bool value) {
 
 // optional string url = 1;
 inline bool DocumentMessage::_internal_has_url() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool DocumentMessage::has_url() const {
   return _internal_has_url();
 }
 inline void DocumentMessage::clear_url() {
-  url_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.url_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& DocumentMessage::url() const {
   // @@protoc_insertion_point(field_get:proto.DocumentMessage.url)
@@ -29863,8 +30909,8 @@ inline const std::string& DocumentMessage::url() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void DocumentMessage::set_url(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- url_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.url_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.DocumentMessage.url)
 }
 inline std::string* DocumentMessage::mutable_url() {
@@ -29873,46 +30919,56 @@ inline std::string* DocumentMessage::mutable_url() {
   return _s;
 }
 inline const std::string& DocumentMessage::_internal_url() const {
-  return url_.Get();
+  return _impl_.url_.Get();
 }
 inline void DocumentMessage::_internal_set_url(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  url_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.url_.Set(value, GetArenaForAllocation());
 }
 inline std::string* DocumentMessage::_internal_mutable_url() {
-  _has_bits_[0] |= 0x00000001u;
-  return url_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.url_.Mutable(GetArenaForAllocation());
 }
 inline std::string* DocumentMessage::release_url() {
   // @@protoc_insertion_point(field_release:proto.DocumentMessage.url)
   if (!_internal_has_url()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return url_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.url_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.url_.IsDefault()) {
+    _impl_.url_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void DocumentMessage::set_allocated_url(std::string* url) {
   if (url != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
+  }
+  _impl_.url_.SetAllocated(url, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.url_.IsDefault()) {
+    _impl_.url_.Set("", GetArenaForAllocation());
   }
-  url_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), url,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.DocumentMessage.url)
 }
 
 // optional string mimetype = 2;
 inline bool DocumentMessage::_internal_has_mimetype() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool DocumentMessage::has_mimetype() const {
   return _internal_has_mimetype();
 }
 inline void DocumentMessage::clear_mimetype() {
-  mimetype_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.mimetype_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& DocumentMessage::mimetype() const {
   // @@protoc_insertion_point(field_get:proto.DocumentMessage.mimetype)
@@ -29921,8 +30977,8 @@ inline const std::string& DocumentMessage::mimetype() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void DocumentMessage::set_mimetype(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- mimetype_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.mimetype_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.DocumentMessage.mimetype)
 }
 inline std::string* DocumentMessage::mutable_mimetype() {
@@ -29931,46 +30987,56 @@ inline std::string* DocumentMessage::mutable_mimetype() {
   return _s;
 }
 inline const std::string& DocumentMessage::_internal_mimetype() const {
-  return mimetype_.Get();
+  return _impl_.mimetype_.Get();
 }
 inline void DocumentMessage::_internal_set_mimetype(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  mimetype_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.mimetype_.Set(value, GetArenaForAllocation());
 }
 inline std::string* DocumentMessage::_internal_mutable_mimetype() {
-  _has_bits_[0] |= 0x00000002u;
-  return mimetype_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.mimetype_.Mutable(GetArenaForAllocation());
 }
 inline std::string* DocumentMessage::release_mimetype() {
   // @@protoc_insertion_point(field_release:proto.DocumentMessage.mimetype)
   if (!_internal_has_mimetype()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return mimetype_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.mimetype_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.mimetype_.IsDefault()) {
+    _impl_.mimetype_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void DocumentMessage::set_allocated_mimetype(std::string* mimetype) {
   if (mimetype != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  mimetype_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), mimetype,
-      GetArenaForAllocation());
+  _impl_.mimetype_.SetAllocated(mimetype, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.mimetype_.IsDefault()) {
+    _impl_.mimetype_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.DocumentMessage.mimetype)
 }
 
 // optional string title = 3;
 inline bool DocumentMessage::_internal_has_title() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool DocumentMessage::has_title() const {
   return _internal_has_title();
 }
 inline void DocumentMessage::clear_title() {
-  title_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.title_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const std::string& DocumentMessage::title() const {
   // @@protoc_insertion_point(field_get:proto.DocumentMessage.title)
@@ -29979,8 +31045,8 @@ inline const std::string& DocumentMessage::title() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void DocumentMessage::set_title(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000004u;
- title_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000004u;
+ _impl_.title_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.DocumentMessage.title)
 }
 inline std::string* DocumentMessage::mutable_title() {
@@ -29989,46 +31055,56 @@ inline std::string* DocumentMessage::mutable_title() {
   return _s;
 }
 inline const std::string& DocumentMessage::_internal_title() const {
-  return title_.Get();
+  return _impl_.title_.Get();
 }
 inline void DocumentMessage::_internal_set_title(const std::string& value) {
-  _has_bits_[0] |= 0x00000004u;
-  title_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.title_.Set(value, GetArenaForAllocation());
 }
 inline std::string* DocumentMessage::_internal_mutable_title() {
-  _has_bits_[0] |= 0x00000004u;
-  return title_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  return _impl_.title_.Mutable(GetArenaForAllocation());
 }
 inline std::string* DocumentMessage::release_title() {
   // @@protoc_insertion_point(field_release:proto.DocumentMessage.title)
   if (!_internal_has_title()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000004u;
-  return title_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  auto* p = _impl_.title_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.title_.IsDefault()) {
+    _impl_.title_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void DocumentMessage::set_allocated_title(std::string* title) {
   if (title != nullptr) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
-  title_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), title,
-      GetArenaForAllocation());
+  _impl_.title_.SetAllocated(title, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.title_.IsDefault()) {
+    _impl_.title_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.DocumentMessage.title)
 }
 
 // optional bytes fileSha256 = 4;
 inline bool DocumentMessage::_internal_has_filesha256() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool DocumentMessage::has_filesha256() const {
   return _internal_has_filesha256();
 }
 inline void DocumentMessage::clear_filesha256() {
-  filesha256_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.filesha256_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline const std::string& DocumentMessage::filesha256() const {
   // @@protoc_insertion_point(field_get:proto.DocumentMessage.fileSha256)
@@ -30037,8 +31113,8 @@ inline const std::string& DocumentMessage::filesha256() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void DocumentMessage::set_filesha256(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000008u;
- filesha256_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000008u;
+ _impl_.filesha256_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.DocumentMessage.fileSha256)
 }
 inline std::string* DocumentMessage::mutable_filesha256() {
@@ -30047,102 +31123,112 @@ inline std::string* DocumentMessage::mutable_filesha256() {
   return _s;
 }
 inline const std::string& DocumentMessage::_internal_filesha256() const {
-  return filesha256_.Get();
+  return _impl_.filesha256_.Get();
 }
 inline void DocumentMessage::_internal_set_filesha256(const std::string& value) {
-  _has_bits_[0] |= 0x00000008u;
-  filesha256_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.filesha256_.Set(value, GetArenaForAllocation());
 }
 inline std::string* DocumentMessage::_internal_mutable_filesha256() {
-  _has_bits_[0] |= 0x00000008u;
-  return filesha256_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  return _impl_.filesha256_.Mutable(GetArenaForAllocation());
 }
 inline std::string* DocumentMessage::release_filesha256() {
   // @@protoc_insertion_point(field_release:proto.DocumentMessage.fileSha256)
   if (!_internal_has_filesha256()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000008u;
-  return filesha256_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  auto* p = _impl_.filesha256_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.filesha256_.IsDefault()) {
+    _impl_.filesha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void DocumentMessage::set_allocated_filesha256(std::string* filesha256) {
   if (filesha256 != nullptr) {
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
   }
-  filesha256_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), filesha256,
-      GetArenaForAllocation());
+  _impl_.filesha256_.SetAllocated(filesha256, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.filesha256_.IsDefault()) {
+    _impl_.filesha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.DocumentMessage.fileSha256)
 }
 
 // optional uint64 fileLength = 5;
 inline bool DocumentMessage::_internal_has_filelength() const {
-  bool value = (_has_bits_[0] & 0x00002000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00002000u) != 0;
   return value;
 }
 inline bool DocumentMessage::has_filelength() const {
   return _internal_has_filelength();
 }
 inline void DocumentMessage::clear_filelength() {
-  filelength_ = uint64_t{0u};
-  _has_bits_[0] &= ~0x00002000u;
+  _impl_.filelength_ = uint64_t{0u};
+  _impl_._has_bits_[0] &= ~0x00002000u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 DocumentMessage::_internal_filelength() const {
-  return filelength_;
+inline uint64_t DocumentMessage::_internal_filelength() const {
+  return _impl_.filelength_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 DocumentMessage::filelength() const {
+inline uint64_t DocumentMessage::filelength() const {
   // @@protoc_insertion_point(field_get:proto.DocumentMessage.fileLength)
   return _internal_filelength();
 }
-inline void DocumentMessage::_internal_set_filelength(::PROTOBUF_NAMESPACE_ID::uint64 value) {
-  _has_bits_[0] |= 0x00002000u;
-  filelength_ = value;
+inline void DocumentMessage::_internal_set_filelength(uint64_t value) {
+  _impl_._has_bits_[0] |= 0x00002000u;
+  _impl_.filelength_ = value;
 }
-inline void DocumentMessage::set_filelength(::PROTOBUF_NAMESPACE_ID::uint64 value) {
+inline void DocumentMessage::set_filelength(uint64_t value) {
   _internal_set_filelength(value);
   // @@protoc_insertion_point(field_set:proto.DocumentMessage.fileLength)
 }
 
 // optional uint32 pageCount = 6;
 inline bool DocumentMessage::_internal_has_pagecount() const {
-  bool value = (_has_bits_[0] & 0x00004000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00004000u) != 0;
   return value;
 }
 inline bool DocumentMessage::has_pagecount() const {
   return _internal_has_pagecount();
 }
 inline void DocumentMessage::clear_pagecount() {
-  pagecount_ = 0u;
-  _has_bits_[0] &= ~0x00004000u;
+  _impl_.pagecount_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00004000u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 DocumentMessage::_internal_pagecount() const {
-  return pagecount_;
+inline uint32_t DocumentMessage::_internal_pagecount() const {
+  return _impl_.pagecount_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 DocumentMessage::pagecount() const {
+inline uint32_t DocumentMessage::pagecount() const {
   // @@protoc_insertion_point(field_get:proto.DocumentMessage.pageCount)
   return _internal_pagecount();
 }
-inline void DocumentMessage::_internal_set_pagecount(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00004000u;
-  pagecount_ = value;
+inline void DocumentMessage::_internal_set_pagecount(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00004000u;
+  _impl_.pagecount_ = value;
 }
-inline void DocumentMessage::set_pagecount(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void DocumentMessage::set_pagecount(uint32_t value) {
   _internal_set_pagecount(value);
   // @@protoc_insertion_point(field_set:proto.DocumentMessage.pageCount)
 }
 
 // optional bytes mediaKey = 7;
 inline bool DocumentMessage::_internal_has_mediakey() const {
-  bool value = (_has_bits_[0] & 0x00000010u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
   return value;
 }
 inline bool DocumentMessage::has_mediakey() const {
   return _internal_has_mediakey();
 }
 inline void DocumentMessage::clear_mediakey() {
-  mediakey_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000010u;
+  _impl_.mediakey_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000010u;
 }
 inline const std::string& DocumentMessage::mediakey() const {
   // @@protoc_insertion_point(field_get:proto.DocumentMessage.mediaKey)
@@ -30151,8 +31237,8 @@ inline const std::string& DocumentMessage::mediakey() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void DocumentMessage::set_mediakey(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000010u;
- mediakey_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000010u;
+ _impl_.mediakey_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.DocumentMessage.mediaKey)
 }
 inline std::string* DocumentMessage::mutable_mediakey() {
@@ -30161,46 +31247,56 @@ inline std::string* DocumentMessage::mutable_mediakey() {
   return _s;
 }
 inline const std::string& DocumentMessage::_internal_mediakey() const {
-  return mediakey_.Get();
+  return _impl_.mediakey_.Get();
 }
 inline void DocumentMessage::_internal_set_mediakey(const std::string& value) {
-  _has_bits_[0] |= 0x00000010u;
-  mediakey_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  _impl_.mediakey_.Set(value, GetArenaForAllocation());
 }
 inline std::string* DocumentMessage::_internal_mutable_mediakey() {
-  _has_bits_[0] |= 0x00000010u;
-  return mediakey_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  return _impl_.mediakey_.Mutable(GetArenaForAllocation());
 }
 inline std::string* DocumentMessage::release_mediakey() {
   // @@protoc_insertion_point(field_release:proto.DocumentMessage.mediaKey)
   if (!_internal_has_mediakey()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000010u;
-  return mediakey_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000010u;
+  auto* p = _impl_.mediakey_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.mediakey_.IsDefault()) {
+    _impl_.mediakey_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void DocumentMessage::set_allocated_mediakey(std::string* mediakey) {
   if (mediakey != nullptr) {
-    _has_bits_[0] |= 0x00000010u;
+    _impl_._has_bits_[0] |= 0x00000010u;
   } else {
-    _has_bits_[0] &= ~0x00000010u;
+    _impl_._has_bits_[0] &= ~0x00000010u;
   }
-  mediakey_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), mediakey,
-      GetArenaForAllocation());
+  _impl_.mediakey_.SetAllocated(mediakey, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.mediakey_.IsDefault()) {
+    _impl_.mediakey_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.DocumentMessage.mediaKey)
 }
 
 // optional string fileName = 8;
 inline bool DocumentMessage::_internal_has_filename() const {
-  bool value = (_has_bits_[0] & 0x00000020u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
   return value;
 }
 inline bool DocumentMessage::has_filename() const {
   return _internal_has_filename();
 }
 inline void DocumentMessage::clear_filename() {
-  filename_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000020u;
+  _impl_.filename_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000020u;
 }
 inline const std::string& DocumentMessage::filename() const {
   // @@protoc_insertion_point(field_get:proto.DocumentMessage.fileName)
@@ -30209,8 +31305,8 @@ inline const std::string& DocumentMessage::filename() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void DocumentMessage::set_filename(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000020u;
- filename_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000020u;
+ _impl_.filename_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.DocumentMessage.fileName)
 }
 inline std::string* DocumentMessage::mutable_filename() {
@@ -30219,46 +31315,56 @@ inline std::string* DocumentMessage::mutable_filename() {
   return _s;
 }
 inline const std::string& DocumentMessage::_internal_filename() const {
-  return filename_.Get();
+  return _impl_.filename_.Get();
 }
 inline void DocumentMessage::_internal_set_filename(const std::string& value) {
-  _has_bits_[0] |= 0x00000020u;
-  filename_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000020u;
+  _impl_.filename_.Set(value, GetArenaForAllocation());
 }
 inline std::string* DocumentMessage::_internal_mutable_filename() {
-  _has_bits_[0] |= 0x00000020u;
-  return filename_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000020u;
+  return _impl_.filename_.Mutable(GetArenaForAllocation());
 }
 inline std::string* DocumentMessage::release_filename() {
   // @@protoc_insertion_point(field_release:proto.DocumentMessage.fileName)
   if (!_internal_has_filename()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000020u;
-  return filename_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000020u;
+  auto* p = _impl_.filename_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.filename_.IsDefault()) {
+    _impl_.filename_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void DocumentMessage::set_allocated_filename(std::string* filename) {
   if (filename != nullptr) {
-    _has_bits_[0] |= 0x00000020u;
+    _impl_._has_bits_[0] |= 0x00000020u;
   } else {
-    _has_bits_[0] &= ~0x00000020u;
+    _impl_._has_bits_[0] &= ~0x00000020u;
   }
-  filename_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), filename,
-      GetArenaForAllocation());
+  _impl_.filename_.SetAllocated(filename, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.filename_.IsDefault()) {
+    _impl_.filename_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.DocumentMessage.fileName)
 }
 
 // optional bytes fileEncSha256 = 9;
 inline bool DocumentMessage::_internal_has_fileencsha256() const {
-  bool value = (_has_bits_[0] & 0x00000040u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
   return value;
 }
 inline bool DocumentMessage::has_fileencsha256() const {
   return _internal_has_fileencsha256();
 }
 inline void DocumentMessage::clear_fileencsha256() {
-  fileencsha256_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000040u;
+  _impl_.fileencsha256_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000040u;
 }
 inline const std::string& DocumentMessage::fileencsha256() const {
   // @@protoc_insertion_point(field_get:proto.DocumentMessage.fileEncSha256)
@@ -30267,8 +31373,8 @@ inline const std::string& DocumentMessage::fileencsha256() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void DocumentMessage::set_fileencsha256(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000040u;
- fileencsha256_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000040u;
+ _impl_.fileencsha256_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.DocumentMessage.fileEncSha256)
 }
 inline std::string* DocumentMessage::mutable_fileencsha256() {
@@ -30277,46 +31383,56 @@ inline std::string* DocumentMessage::mutable_fileencsha256() {
   return _s;
 }
 inline const std::string& DocumentMessage::_internal_fileencsha256() const {
-  return fileencsha256_.Get();
+  return _impl_.fileencsha256_.Get();
 }
 inline void DocumentMessage::_internal_set_fileencsha256(const std::string& value) {
-  _has_bits_[0] |= 0x00000040u;
-  fileencsha256_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000040u;
+  _impl_.fileencsha256_.Set(value, GetArenaForAllocation());
 }
 inline std::string* DocumentMessage::_internal_mutable_fileencsha256() {
-  _has_bits_[0] |= 0x00000040u;
-  return fileencsha256_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000040u;
+  return _impl_.fileencsha256_.Mutable(GetArenaForAllocation());
 }
 inline std::string* DocumentMessage::release_fileencsha256() {
   // @@protoc_insertion_point(field_release:proto.DocumentMessage.fileEncSha256)
   if (!_internal_has_fileencsha256()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000040u;
-  return fileencsha256_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000040u;
+  auto* p = _impl_.fileencsha256_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.fileencsha256_.IsDefault()) {
+    _impl_.fileencsha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void DocumentMessage::set_allocated_fileencsha256(std::string* fileencsha256) {
   if (fileencsha256 != nullptr) {
-    _has_bits_[0] |= 0x00000040u;
+    _impl_._has_bits_[0] |= 0x00000040u;
   } else {
-    _has_bits_[0] &= ~0x00000040u;
+    _impl_._has_bits_[0] &= ~0x00000040u;
   }
-  fileencsha256_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), fileencsha256,
-      GetArenaForAllocation());
+  _impl_.fileencsha256_.SetAllocated(fileencsha256, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.fileencsha256_.IsDefault()) {
+    _impl_.fileencsha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.DocumentMessage.fileEncSha256)
 }
 
 // optional string directPath = 10;
 inline bool DocumentMessage::_internal_has_directpath() const {
-  bool value = (_has_bits_[0] & 0x00000080u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000080u) != 0;
   return value;
 }
 inline bool DocumentMessage::has_directpath() const {
   return _internal_has_directpath();
 }
 inline void DocumentMessage::clear_directpath() {
-  directpath_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000080u;
+  _impl_.directpath_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000080u;
 }
 inline const std::string& DocumentMessage::directpath() const {
   // @@protoc_insertion_point(field_get:proto.DocumentMessage.directPath)
@@ -30325,8 +31441,8 @@ inline const std::string& DocumentMessage::directpath() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void DocumentMessage::set_directpath(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000080u;
- directpath_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000080u;
+ _impl_.directpath_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.DocumentMessage.directPath)
 }
 inline std::string* DocumentMessage::mutable_directpath() {
@@ -30335,85 +31451,95 @@ inline std::string* DocumentMessage::mutable_directpath() {
   return _s;
 }
 inline const std::string& DocumentMessage::_internal_directpath() const {
-  return directpath_.Get();
+  return _impl_.directpath_.Get();
 }
 inline void DocumentMessage::_internal_set_directpath(const std::string& value) {
-  _has_bits_[0] |= 0x00000080u;
-  directpath_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000080u;
+  _impl_.directpath_.Set(value, GetArenaForAllocation());
 }
 inline std::string* DocumentMessage::_internal_mutable_directpath() {
-  _has_bits_[0] |= 0x00000080u;
-  return directpath_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000080u;
+  return _impl_.directpath_.Mutable(GetArenaForAllocation());
 }
 inline std::string* DocumentMessage::release_directpath() {
   // @@protoc_insertion_point(field_release:proto.DocumentMessage.directPath)
   if (!_internal_has_directpath()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000080u;
-  return directpath_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000080u;
+  auto* p = _impl_.directpath_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.directpath_.IsDefault()) {
+    _impl_.directpath_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void DocumentMessage::set_allocated_directpath(std::string* directpath) {
   if (directpath != nullptr) {
-    _has_bits_[0] |= 0x00000080u;
+    _impl_._has_bits_[0] |= 0x00000080u;
   } else {
-    _has_bits_[0] &= ~0x00000080u;
+    _impl_._has_bits_[0] &= ~0x00000080u;
   }
-  directpath_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), directpath,
-      GetArenaForAllocation());
+  _impl_.directpath_.SetAllocated(directpath, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.directpath_.IsDefault()) {
+    _impl_.directpath_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.DocumentMessage.directPath)
 }
 
 // optional int64 mediaKeyTimestamp = 11;
 inline bool DocumentMessage::_internal_has_mediakeytimestamp() const {
-  bool value = (_has_bits_[0] & 0x00010000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00010000u) != 0;
   return value;
 }
 inline bool DocumentMessage::has_mediakeytimestamp() const {
   return _internal_has_mediakeytimestamp();
 }
 inline void DocumentMessage::clear_mediakeytimestamp() {
-  mediakeytimestamp_ = int64_t{0};
-  _has_bits_[0] &= ~0x00010000u;
+  _impl_.mediakeytimestamp_ = int64_t{0};
+  _impl_._has_bits_[0] &= ~0x00010000u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 DocumentMessage::_internal_mediakeytimestamp() const {
-  return mediakeytimestamp_;
+inline int64_t DocumentMessage::_internal_mediakeytimestamp() const {
+  return _impl_.mediakeytimestamp_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 DocumentMessage::mediakeytimestamp() const {
+inline int64_t DocumentMessage::mediakeytimestamp() const {
   // @@protoc_insertion_point(field_get:proto.DocumentMessage.mediaKeyTimestamp)
   return _internal_mediakeytimestamp();
 }
-inline void DocumentMessage::_internal_set_mediakeytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value) {
-  _has_bits_[0] |= 0x00010000u;
-  mediakeytimestamp_ = value;
+inline void DocumentMessage::_internal_set_mediakeytimestamp(int64_t value) {
+  _impl_._has_bits_[0] |= 0x00010000u;
+  _impl_.mediakeytimestamp_ = value;
 }
-inline void DocumentMessage::set_mediakeytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value) {
+inline void DocumentMessage::set_mediakeytimestamp(int64_t value) {
   _internal_set_mediakeytimestamp(value);
   // @@protoc_insertion_point(field_set:proto.DocumentMessage.mediaKeyTimestamp)
 }
 
 // optional bool contactVcard = 12;
 inline bool DocumentMessage::_internal_has_contactvcard() const {
-  bool value = (_has_bits_[0] & 0x00008000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00008000u) != 0;
   return value;
 }
 inline bool DocumentMessage::has_contactvcard() const {
   return _internal_has_contactvcard();
 }
 inline void DocumentMessage::clear_contactvcard() {
-  contactvcard_ = false;
-  _has_bits_[0] &= ~0x00008000u;
+  _impl_.contactvcard_ = false;
+  _impl_._has_bits_[0] &= ~0x00008000u;
 }
 inline bool DocumentMessage::_internal_contactvcard() const {
-  return contactvcard_;
+  return _impl_.contactvcard_;
 }
 inline bool DocumentMessage::contactvcard() const {
   // @@protoc_insertion_point(field_get:proto.DocumentMessage.contactVcard)
   return _internal_contactvcard();
 }
 inline void DocumentMessage::_internal_set_contactvcard(bool value) {
-  _has_bits_[0] |= 0x00008000u;
-  contactvcard_ = value;
+  _impl_._has_bits_[0] |= 0x00008000u;
+  _impl_.contactvcard_ = value;
 }
 inline void DocumentMessage::set_contactvcard(bool value) {
   _internal_set_contactvcard(value);
@@ -30422,15 +31548,15 @@ inline void DocumentMessage::set_contactvcard(bool value) {
 
 // optional string thumbnailDirectPath = 13;
 inline bool DocumentMessage::_internal_has_thumbnaildirectpath() const {
-  bool value = (_has_bits_[0] & 0x00000100u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000100u) != 0;
   return value;
 }
 inline bool DocumentMessage::has_thumbnaildirectpath() const {
   return _internal_has_thumbnaildirectpath();
 }
 inline void DocumentMessage::clear_thumbnaildirectpath() {
-  thumbnaildirectpath_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000100u;
+  _impl_.thumbnaildirectpath_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000100u;
 }
 inline const std::string& DocumentMessage::thumbnaildirectpath() const {
   // @@protoc_insertion_point(field_get:proto.DocumentMessage.thumbnailDirectPath)
@@ -30439,8 +31565,8 @@ inline const std::string& DocumentMessage::thumbnaildirectpath() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void DocumentMessage::set_thumbnaildirectpath(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000100u;
- thumbnaildirectpath_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000100u;
+ _impl_.thumbnaildirectpath_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.DocumentMessage.thumbnailDirectPath)
 }
 inline std::string* DocumentMessage::mutable_thumbnaildirectpath() {
@@ -30449,46 +31575,56 @@ inline std::string* DocumentMessage::mutable_thumbnaildirectpath() {
   return _s;
 }
 inline const std::string& DocumentMessage::_internal_thumbnaildirectpath() const {
-  return thumbnaildirectpath_.Get();
+  return _impl_.thumbnaildirectpath_.Get();
 }
 inline void DocumentMessage::_internal_set_thumbnaildirectpath(const std::string& value) {
-  _has_bits_[0] |= 0x00000100u;
-  thumbnaildirectpath_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000100u;
+  _impl_.thumbnaildirectpath_.Set(value, GetArenaForAllocation());
 }
 inline std::string* DocumentMessage::_internal_mutable_thumbnaildirectpath() {
-  _has_bits_[0] |= 0x00000100u;
-  return thumbnaildirectpath_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000100u;
+  return _impl_.thumbnaildirectpath_.Mutable(GetArenaForAllocation());
 }
 inline std::string* DocumentMessage::release_thumbnaildirectpath() {
   // @@protoc_insertion_point(field_release:proto.DocumentMessage.thumbnailDirectPath)
   if (!_internal_has_thumbnaildirectpath()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000100u;
-  return thumbnaildirectpath_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000100u;
+  auto* p = _impl_.thumbnaildirectpath_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.thumbnaildirectpath_.IsDefault()) {
+    _impl_.thumbnaildirectpath_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void DocumentMessage::set_allocated_thumbnaildirectpath(std::string* thumbnaildirectpath) {
   if (thumbnaildirectpath != nullptr) {
-    _has_bits_[0] |= 0x00000100u;
+    _impl_._has_bits_[0] |= 0x00000100u;
   } else {
-    _has_bits_[0] &= ~0x00000100u;
+    _impl_._has_bits_[0] &= ~0x00000100u;
+  }
+  _impl_.thumbnaildirectpath_.SetAllocated(thumbnaildirectpath, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.thumbnaildirectpath_.IsDefault()) {
+    _impl_.thumbnaildirectpath_.Set("", GetArenaForAllocation());
   }
-  thumbnaildirectpath_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), thumbnaildirectpath,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.DocumentMessage.thumbnailDirectPath)
 }
 
 // optional bytes thumbnailSha256 = 14;
 inline bool DocumentMessage::_internal_has_thumbnailsha256() const {
-  bool value = (_has_bits_[0] & 0x00000200u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000200u) != 0;
   return value;
 }
 inline bool DocumentMessage::has_thumbnailsha256() const {
   return _internal_has_thumbnailsha256();
 }
 inline void DocumentMessage::clear_thumbnailsha256() {
-  thumbnailsha256_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000200u;
+  _impl_.thumbnailsha256_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000200u;
 }
 inline const std::string& DocumentMessage::thumbnailsha256() const {
   // @@protoc_insertion_point(field_get:proto.DocumentMessage.thumbnailSha256)
@@ -30497,8 +31633,8 @@ inline const std::string& DocumentMessage::thumbnailsha256() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void DocumentMessage::set_thumbnailsha256(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000200u;
- thumbnailsha256_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000200u;
+ _impl_.thumbnailsha256_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.DocumentMessage.thumbnailSha256)
 }
 inline std::string* DocumentMessage::mutable_thumbnailsha256() {
@@ -30507,46 +31643,56 @@ inline std::string* DocumentMessage::mutable_thumbnailsha256() {
   return _s;
 }
 inline const std::string& DocumentMessage::_internal_thumbnailsha256() const {
-  return thumbnailsha256_.Get();
+  return _impl_.thumbnailsha256_.Get();
 }
 inline void DocumentMessage::_internal_set_thumbnailsha256(const std::string& value) {
-  _has_bits_[0] |= 0x00000200u;
-  thumbnailsha256_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000200u;
+  _impl_.thumbnailsha256_.Set(value, GetArenaForAllocation());
 }
 inline std::string* DocumentMessage::_internal_mutable_thumbnailsha256() {
-  _has_bits_[0] |= 0x00000200u;
-  return thumbnailsha256_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000200u;
+  return _impl_.thumbnailsha256_.Mutable(GetArenaForAllocation());
 }
 inline std::string* DocumentMessage::release_thumbnailsha256() {
   // @@protoc_insertion_point(field_release:proto.DocumentMessage.thumbnailSha256)
   if (!_internal_has_thumbnailsha256()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000200u;
-  return thumbnailsha256_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000200u;
+  auto* p = _impl_.thumbnailsha256_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.thumbnailsha256_.IsDefault()) {
+    _impl_.thumbnailsha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void DocumentMessage::set_allocated_thumbnailsha256(std::string* thumbnailsha256) {
   if (thumbnailsha256 != nullptr) {
-    _has_bits_[0] |= 0x00000200u;
+    _impl_._has_bits_[0] |= 0x00000200u;
   } else {
-    _has_bits_[0] &= ~0x00000200u;
+    _impl_._has_bits_[0] &= ~0x00000200u;
+  }
+  _impl_.thumbnailsha256_.SetAllocated(thumbnailsha256, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.thumbnailsha256_.IsDefault()) {
+    _impl_.thumbnailsha256_.Set("", GetArenaForAllocation());
   }
-  thumbnailsha256_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), thumbnailsha256,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.DocumentMessage.thumbnailSha256)
 }
 
 // optional bytes thumbnailEncSha256 = 15;
 inline bool DocumentMessage::_internal_has_thumbnailencsha256() const {
-  bool value = (_has_bits_[0] & 0x00000400u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000400u) != 0;
   return value;
 }
 inline bool DocumentMessage::has_thumbnailencsha256() const {
   return _internal_has_thumbnailencsha256();
 }
 inline void DocumentMessage::clear_thumbnailencsha256() {
-  thumbnailencsha256_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000400u;
+  _impl_.thumbnailencsha256_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000400u;
 }
 inline const std::string& DocumentMessage::thumbnailencsha256() const {
   // @@protoc_insertion_point(field_get:proto.DocumentMessage.thumbnailEncSha256)
@@ -30555,8 +31701,8 @@ inline const std::string& DocumentMessage::thumbnailencsha256() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void DocumentMessage::set_thumbnailencsha256(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000400u;
- thumbnailencsha256_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000400u;
+ _impl_.thumbnailencsha256_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.DocumentMessage.thumbnailEncSha256)
 }
 inline std::string* DocumentMessage::mutable_thumbnailencsha256() {
@@ -30565,46 +31711,56 @@ inline std::string* DocumentMessage::mutable_thumbnailencsha256() {
   return _s;
 }
 inline const std::string& DocumentMessage::_internal_thumbnailencsha256() const {
-  return thumbnailencsha256_.Get();
+  return _impl_.thumbnailencsha256_.Get();
 }
 inline void DocumentMessage::_internal_set_thumbnailencsha256(const std::string& value) {
-  _has_bits_[0] |= 0x00000400u;
-  thumbnailencsha256_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000400u;
+  _impl_.thumbnailencsha256_.Set(value, GetArenaForAllocation());
 }
 inline std::string* DocumentMessage::_internal_mutable_thumbnailencsha256() {
-  _has_bits_[0] |= 0x00000400u;
-  return thumbnailencsha256_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000400u;
+  return _impl_.thumbnailencsha256_.Mutable(GetArenaForAllocation());
 }
 inline std::string* DocumentMessage::release_thumbnailencsha256() {
   // @@protoc_insertion_point(field_release:proto.DocumentMessage.thumbnailEncSha256)
   if (!_internal_has_thumbnailencsha256()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000400u;
-  return thumbnailencsha256_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000400u;
+  auto* p = _impl_.thumbnailencsha256_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.thumbnailencsha256_.IsDefault()) {
+    _impl_.thumbnailencsha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void DocumentMessage::set_allocated_thumbnailencsha256(std::string* thumbnailencsha256) {
   if (thumbnailencsha256 != nullptr) {
-    _has_bits_[0] |= 0x00000400u;
+    _impl_._has_bits_[0] |= 0x00000400u;
   } else {
-    _has_bits_[0] &= ~0x00000400u;
+    _impl_._has_bits_[0] &= ~0x00000400u;
+  }
+  _impl_.thumbnailencsha256_.SetAllocated(thumbnailencsha256, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.thumbnailencsha256_.IsDefault()) {
+    _impl_.thumbnailencsha256_.Set("", GetArenaForAllocation());
   }
-  thumbnailencsha256_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), thumbnailencsha256,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.DocumentMessage.thumbnailEncSha256)
 }
 
 // optional bytes jpegThumbnail = 16;
 inline bool DocumentMessage::_internal_has_jpegthumbnail() const {
-  bool value = (_has_bits_[0] & 0x00000800u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000800u) != 0;
   return value;
 }
 inline bool DocumentMessage::has_jpegthumbnail() const {
   return _internal_has_jpegthumbnail();
 }
 inline void DocumentMessage::clear_jpegthumbnail() {
-  jpegthumbnail_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000800u;
+  _impl_.jpegthumbnail_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000800u;
 }
 inline const std::string& DocumentMessage::jpegthumbnail() const {
   // @@protoc_insertion_point(field_get:proto.DocumentMessage.jpegThumbnail)
@@ -30613,8 +31769,8 @@ inline const std::string& DocumentMessage::jpegthumbnail() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void DocumentMessage::set_jpegthumbnail(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000800u;
- jpegthumbnail_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000800u;
+ _impl_.jpegthumbnail_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.DocumentMessage.jpegThumbnail)
 }
 inline std::string* DocumentMessage::mutable_jpegthumbnail() {
@@ -30623,50 +31779,60 @@ inline std::string* DocumentMessage::mutable_jpegthumbnail() {
   return _s;
 }
 inline const std::string& DocumentMessage::_internal_jpegthumbnail() const {
-  return jpegthumbnail_.Get();
+  return _impl_.jpegthumbnail_.Get();
 }
 inline void DocumentMessage::_internal_set_jpegthumbnail(const std::string& value) {
-  _has_bits_[0] |= 0x00000800u;
-  jpegthumbnail_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000800u;
+  _impl_.jpegthumbnail_.Set(value, GetArenaForAllocation());
 }
 inline std::string* DocumentMessage::_internal_mutable_jpegthumbnail() {
-  _has_bits_[0] |= 0x00000800u;
-  return jpegthumbnail_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000800u;
+  return _impl_.jpegthumbnail_.Mutable(GetArenaForAllocation());
 }
 inline std::string* DocumentMessage::release_jpegthumbnail() {
   // @@protoc_insertion_point(field_release:proto.DocumentMessage.jpegThumbnail)
   if (!_internal_has_jpegthumbnail()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000800u;
-  return jpegthumbnail_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000800u;
+  auto* p = _impl_.jpegthumbnail_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.jpegthumbnail_.IsDefault()) {
+    _impl_.jpegthumbnail_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void DocumentMessage::set_allocated_jpegthumbnail(std::string* jpegthumbnail) {
   if (jpegthumbnail != nullptr) {
-    _has_bits_[0] |= 0x00000800u;
+    _impl_._has_bits_[0] |= 0x00000800u;
   } else {
-    _has_bits_[0] &= ~0x00000800u;
+    _impl_._has_bits_[0] &= ~0x00000800u;
+  }
+  _impl_.jpegthumbnail_.SetAllocated(jpegthumbnail, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.jpegthumbnail_.IsDefault()) {
+    _impl_.jpegthumbnail_.Set("", GetArenaForAllocation());
   }
-  jpegthumbnail_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), jpegthumbnail,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.DocumentMessage.jpegThumbnail)
 }
 
 // optional .proto.ContextInfo contextInfo = 17;
 inline bool DocumentMessage::_internal_has_contextinfo() const {
-  bool value = (_has_bits_[0] & 0x00001000u) != 0;
-  PROTOBUF_ASSUME(!value || contextinfo_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00001000u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.contextinfo_ != nullptr);
   return value;
 }
 inline bool DocumentMessage::has_contextinfo() const {
   return _internal_has_contextinfo();
 }
 inline void DocumentMessage::clear_contextinfo() {
-  if (contextinfo_ != nullptr) contextinfo_->Clear();
-  _has_bits_[0] &= ~0x00001000u;
+  if (_impl_.contextinfo_ != nullptr) _impl_.contextinfo_->Clear();
+  _impl_._has_bits_[0] &= ~0x00001000u;
 }
 inline const ::proto::ContextInfo& DocumentMessage::_internal_contextinfo() const {
-  const ::proto::ContextInfo* p = contextinfo_;
+  const ::proto::ContextInfo* p = _impl_.contextinfo_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ContextInfo&>(
       ::proto::_ContextInfo_default_instance_);
 }
@@ -30677,20 +31843,20 @@ inline const ::proto::ContextInfo& DocumentMessage::contextinfo() const {
 inline void DocumentMessage::unsafe_arena_set_allocated_contextinfo(
     ::proto::ContextInfo* contextinfo) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(contextinfo_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.contextinfo_);
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   if (contextinfo) {
-    _has_bits_[0] |= 0x00001000u;
+    _impl_._has_bits_[0] |= 0x00001000u;
   } else {
-    _has_bits_[0] &= ~0x00001000u;
+    _impl_._has_bits_[0] &= ~0x00001000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.DocumentMessage.contextInfo)
 }
 inline ::proto::ContextInfo* DocumentMessage::release_contextinfo() {
-  _has_bits_[0] &= ~0x00001000u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00001000u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -30704,18 +31870,18 @@ inline ::proto::ContextInfo* DocumentMessage::release_contextinfo() {
 }
 inline ::proto::ContextInfo* DocumentMessage::unsafe_arena_release_contextinfo() {
   // @@protoc_insertion_point(field_release:proto.DocumentMessage.contextInfo)
-  _has_bits_[0] &= ~0x00001000u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00001000u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
   return temp;
 }
 inline ::proto::ContextInfo* DocumentMessage::_internal_mutable_contextinfo() {
-  _has_bits_[0] |= 0x00001000u;
-  if (contextinfo_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00001000u;
+  if (_impl_.contextinfo_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ContextInfo>(GetArenaForAllocation());
-    contextinfo_ = p;
+    _impl_.contextinfo_ = p;
   }
-  return contextinfo_;
+  return _impl_.contextinfo_;
 }
 inline ::proto::ContextInfo* DocumentMessage::mutable_contextinfo() {
   ::proto::ContextInfo* _msg = _internal_mutable_contextinfo();
@@ -30725,75 +31891,75 @@ inline ::proto::ContextInfo* DocumentMessage::mutable_contextinfo() {
 inline void DocumentMessage::set_allocated_contextinfo(::proto::ContextInfo* contextinfo) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete contextinfo_;
+    delete _impl_.contextinfo_;
   }
   if (contextinfo) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ContextInfo>::GetOwningArena(contextinfo);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(contextinfo);
     if (message_arena != submessage_arena) {
       contextinfo = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, contextinfo, submessage_arena);
     }
-    _has_bits_[0] |= 0x00001000u;
+    _impl_._has_bits_[0] |= 0x00001000u;
   } else {
-    _has_bits_[0] &= ~0x00001000u;
+    _impl_._has_bits_[0] &= ~0x00001000u;
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   // @@protoc_insertion_point(field_set_allocated:proto.DocumentMessage.contextInfo)
 }
 
 // optional uint32 thumbnailHeight = 18;
 inline bool DocumentMessage::_internal_has_thumbnailheight() const {
-  bool value = (_has_bits_[0] & 0x00020000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00020000u) != 0;
   return value;
 }
 inline bool DocumentMessage::has_thumbnailheight() const {
   return _internal_has_thumbnailheight();
 }
 inline void DocumentMessage::clear_thumbnailheight() {
-  thumbnailheight_ = 0u;
-  _has_bits_[0] &= ~0x00020000u;
+  _impl_.thumbnailheight_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00020000u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 DocumentMessage::_internal_thumbnailheight() const {
-  return thumbnailheight_;
+inline uint32_t DocumentMessage::_internal_thumbnailheight() const {
+  return _impl_.thumbnailheight_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 DocumentMessage::thumbnailheight() const {
+inline uint32_t DocumentMessage::thumbnailheight() const {
   // @@protoc_insertion_point(field_get:proto.DocumentMessage.thumbnailHeight)
   return _internal_thumbnailheight();
 }
-inline void DocumentMessage::_internal_set_thumbnailheight(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00020000u;
-  thumbnailheight_ = value;
+inline void DocumentMessage::_internal_set_thumbnailheight(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00020000u;
+  _impl_.thumbnailheight_ = value;
 }
-inline void DocumentMessage::set_thumbnailheight(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void DocumentMessage::set_thumbnailheight(uint32_t value) {
   _internal_set_thumbnailheight(value);
   // @@protoc_insertion_point(field_set:proto.DocumentMessage.thumbnailHeight)
 }
 
 // optional uint32 thumbnailWidth = 19;
 inline bool DocumentMessage::_internal_has_thumbnailwidth() const {
-  bool value = (_has_bits_[0] & 0x00040000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00040000u) != 0;
   return value;
 }
 inline bool DocumentMessage::has_thumbnailwidth() const {
   return _internal_has_thumbnailwidth();
 }
 inline void DocumentMessage::clear_thumbnailwidth() {
-  thumbnailwidth_ = 0u;
-  _has_bits_[0] &= ~0x00040000u;
+  _impl_.thumbnailwidth_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00040000u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 DocumentMessage::_internal_thumbnailwidth() const {
-  return thumbnailwidth_;
+inline uint32_t DocumentMessage::_internal_thumbnailwidth() const {
+  return _impl_.thumbnailwidth_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 DocumentMessage::thumbnailwidth() const {
+inline uint32_t DocumentMessage::thumbnailwidth() const {
   // @@protoc_insertion_point(field_get:proto.DocumentMessage.thumbnailWidth)
   return _internal_thumbnailwidth();
 }
-inline void DocumentMessage::_internal_set_thumbnailwidth(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00040000u;
-  thumbnailwidth_ = value;
+inline void DocumentMessage::_internal_set_thumbnailwidth(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00040000u;
+  _impl_.thumbnailwidth_ = value;
 }
-inline void DocumentMessage::set_thumbnailwidth(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void DocumentMessage::set_thumbnailwidth(uint32_t value) {
   _internal_set_thumbnailwidth(value);
   // @@protoc_insertion_point(field_set:proto.DocumentMessage.thumbnailWidth)
 }
@@ -30804,15 +31970,15 @@ inline void DocumentMessage::set_thumbnailwidth(::PROTOBUF_NAMESPACE_ID::uint32
 
 // optional string url = 1;
 inline bool AudioMessage::_internal_has_url() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool AudioMessage::has_url() const {
   return _internal_has_url();
 }
 inline void AudioMessage::clear_url() {
-  url_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.url_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& AudioMessage::url() const {
   // @@protoc_insertion_point(field_get:proto.AudioMessage.url)
@@ -30821,8 +31987,8 @@ inline const std::string& AudioMessage::url() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void AudioMessage::set_url(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- url_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.url_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.AudioMessage.url)
 }
 inline std::string* AudioMessage::mutable_url() {
@@ -30831,46 +31997,56 @@ inline std::string* AudioMessage::mutable_url() {
   return _s;
 }
 inline const std::string& AudioMessage::_internal_url() const {
-  return url_.Get();
+  return _impl_.url_.Get();
 }
 inline void AudioMessage::_internal_set_url(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  url_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.url_.Set(value, GetArenaForAllocation());
 }
 inline std::string* AudioMessage::_internal_mutable_url() {
-  _has_bits_[0] |= 0x00000001u;
-  return url_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.url_.Mutable(GetArenaForAllocation());
 }
 inline std::string* AudioMessage::release_url() {
   // @@protoc_insertion_point(field_release:proto.AudioMessage.url)
   if (!_internal_has_url()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return url_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.url_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.url_.IsDefault()) {
+    _impl_.url_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void AudioMessage::set_allocated_url(std::string* url) {
   if (url != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
+  }
+  _impl_.url_.SetAllocated(url, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.url_.IsDefault()) {
+    _impl_.url_.Set("", GetArenaForAllocation());
   }
-  url_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), url,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.AudioMessage.url)
 }
 
 // optional string mimetype = 2;
 inline bool AudioMessage::_internal_has_mimetype() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool AudioMessage::has_mimetype() const {
   return _internal_has_mimetype();
 }
 inline void AudioMessage::clear_mimetype() {
-  mimetype_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.mimetype_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& AudioMessage::mimetype() const {
   // @@protoc_insertion_point(field_get:proto.AudioMessage.mimetype)
@@ -30879,8 +32055,8 @@ inline const std::string& AudioMessage::mimetype() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void AudioMessage::set_mimetype(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- mimetype_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.mimetype_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.AudioMessage.mimetype)
 }
 inline std::string* AudioMessage::mutable_mimetype() {
@@ -30889,46 +32065,56 @@ inline std::string* AudioMessage::mutable_mimetype() {
   return _s;
 }
 inline const std::string& AudioMessage::_internal_mimetype() const {
-  return mimetype_.Get();
+  return _impl_.mimetype_.Get();
 }
 inline void AudioMessage::_internal_set_mimetype(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  mimetype_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.mimetype_.Set(value, GetArenaForAllocation());
 }
 inline std::string* AudioMessage::_internal_mutable_mimetype() {
-  _has_bits_[0] |= 0x00000002u;
-  return mimetype_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.mimetype_.Mutable(GetArenaForAllocation());
 }
 inline std::string* AudioMessage::release_mimetype() {
   // @@protoc_insertion_point(field_release:proto.AudioMessage.mimetype)
   if (!_internal_has_mimetype()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return mimetype_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.mimetype_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.mimetype_.IsDefault()) {
+    _impl_.mimetype_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void AudioMessage::set_allocated_mimetype(std::string* mimetype) {
   if (mimetype != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
+  }
+  _impl_.mimetype_.SetAllocated(mimetype, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.mimetype_.IsDefault()) {
+    _impl_.mimetype_.Set("", GetArenaForAllocation());
   }
-  mimetype_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), mimetype,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.AudioMessage.mimetype)
 }
 
 // optional bytes fileSha256 = 3;
 inline bool AudioMessage::_internal_has_filesha256() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool AudioMessage::has_filesha256() const {
   return _internal_has_filesha256();
 }
 inline void AudioMessage::clear_filesha256() {
-  filesha256_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.filesha256_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const std::string& AudioMessage::filesha256() const {
   // @@protoc_insertion_point(field_get:proto.AudioMessage.fileSha256)
@@ -30937,8 +32123,8 @@ inline const std::string& AudioMessage::filesha256() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void AudioMessage::set_filesha256(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000004u;
- filesha256_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000004u;
+ _impl_.filesha256_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.AudioMessage.fileSha256)
 }
 inline std::string* AudioMessage::mutable_filesha256() {
@@ -30947,113 +32133,123 @@ inline std::string* AudioMessage::mutable_filesha256() {
   return _s;
 }
 inline const std::string& AudioMessage::_internal_filesha256() const {
-  return filesha256_.Get();
+  return _impl_.filesha256_.Get();
 }
 inline void AudioMessage::_internal_set_filesha256(const std::string& value) {
-  _has_bits_[0] |= 0x00000004u;
-  filesha256_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.filesha256_.Set(value, GetArenaForAllocation());
 }
 inline std::string* AudioMessage::_internal_mutable_filesha256() {
-  _has_bits_[0] |= 0x00000004u;
-  return filesha256_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  return _impl_.filesha256_.Mutable(GetArenaForAllocation());
 }
 inline std::string* AudioMessage::release_filesha256() {
   // @@protoc_insertion_point(field_release:proto.AudioMessage.fileSha256)
   if (!_internal_has_filesha256()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000004u;
-  return filesha256_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  auto* p = _impl_.filesha256_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.filesha256_.IsDefault()) {
+    _impl_.filesha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void AudioMessage::set_allocated_filesha256(std::string* filesha256) {
   if (filesha256 != nullptr) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
+  }
+  _impl_.filesha256_.SetAllocated(filesha256, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.filesha256_.IsDefault()) {
+    _impl_.filesha256_.Set("", GetArenaForAllocation());
   }
-  filesha256_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), filesha256,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.AudioMessage.fileSha256)
 }
 
 // optional uint64 fileLength = 4;
 inline bool AudioMessage::_internal_has_filelength() const {
-  bool value = (_has_bits_[0] & 0x00000100u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000100u) != 0;
   return value;
 }
 inline bool AudioMessage::has_filelength() const {
   return _internal_has_filelength();
 }
 inline void AudioMessage::clear_filelength() {
-  filelength_ = uint64_t{0u};
-  _has_bits_[0] &= ~0x00000100u;
+  _impl_.filelength_ = uint64_t{0u};
+  _impl_._has_bits_[0] &= ~0x00000100u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 AudioMessage::_internal_filelength() const {
-  return filelength_;
+inline uint64_t AudioMessage::_internal_filelength() const {
+  return _impl_.filelength_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 AudioMessage::filelength() const {
+inline uint64_t AudioMessage::filelength() const {
   // @@protoc_insertion_point(field_get:proto.AudioMessage.fileLength)
   return _internal_filelength();
 }
-inline void AudioMessage::_internal_set_filelength(::PROTOBUF_NAMESPACE_ID::uint64 value) {
-  _has_bits_[0] |= 0x00000100u;
-  filelength_ = value;
+inline void AudioMessage::_internal_set_filelength(uint64_t value) {
+  _impl_._has_bits_[0] |= 0x00000100u;
+  _impl_.filelength_ = value;
 }
-inline void AudioMessage::set_filelength(::PROTOBUF_NAMESPACE_ID::uint64 value) {
+inline void AudioMessage::set_filelength(uint64_t value) {
   _internal_set_filelength(value);
   // @@protoc_insertion_point(field_set:proto.AudioMessage.fileLength)
 }
 
 // optional uint32 seconds = 5;
 inline bool AudioMessage::_internal_has_seconds() const {
-  bool value = (_has_bits_[0] & 0x00000200u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000200u) != 0;
   return value;
 }
 inline bool AudioMessage::has_seconds() const {
   return _internal_has_seconds();
 }
 inline void AudioMessage::clear_seconds() {
-  seconds_ = 0u;
-  _has_bits_[0] &= ~0x00000200u;
+  _impl_.seconds_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000200u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 AudioMessage::_internal_seconds() const {
-  return seconds_;
+inline uint32_t AudioMessage::_internal_seconds() const {
+  return _impl_.seconds_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 AudioMessage::seconds() const {
+inline uint32_t AudioMessage::seconds() const {
   // @@protoc_insertion_point(field_get:proto.AudioMessage.seconds)
   return _internal_seconds();
 }
-inline void AudioMessage::_internal_set_seconds(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000200u;
-  seconds_ = value;
+inline void AudioMessage::_internal_set_seconds(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000200u;
+  _impl_.seconds_ = value;
 }
-inline void AudioMessage::set_seconds(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void AudioMessage::set_seconds(uint32_t value) {
   _internal_set_seconds(value);
   // @@protoc_insertion_point(field_set:proto.AudioMessage.seconds)
 }
 
 // optional bool ptt = 6;
 inline bool AudioMessage::_internal_has_ptt() const {
-  bool value = (_has_bits_[0] & 0x00000400u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000400u) != 0;
   return value;
 }
 inline bool AudioMessage::has_ptt() const {
   return _internal_has_ptt();
 }
 inline void AudioMessage::clear_ptt() {
-  ptt_ = false;
-  _has_bits_[0] &= ~0x00000400u;
+  _impl_.ptt_ = false;
+  _impl_._has_bits_[0] &= ~0x00000400u;
 }
 inline bool AudioMessage::_internal_ptt() const {
-  return ptt_;
+  return _impl_.ptt_;
 }
 inline bool AudioMessage::ptt() const {
   // @@protoc_insertion_point(field_get:proto.AudioMessage.ptt)
   return _internal_ptt();
 }
 inline void AudioMessage::_internal_set_ptt(bool value) {
-  _has_bits_[0] |= 0x00000400u;
-  ptt_ = value;
+  _impl_._has_bits_[0] |= 0x00000400u;
+  _impl_.ptt_ = value;
 }
 inline void AudioMessage::set_ptt(bool value) {
   _internal_set_ptt(value);
@@ -31062,15 +32258,15 @@ inline void AudioMessage::set_ptt(bool value) {
 
 // optional bytes mediaKey = 7;
 inline bool AudioMessage::_internal_has_mediakey() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool AudioMessage::has_mediakey() const {
   return _internal_has_mediakey();
 }
 inline void AudioMessage::clear_mediakey() {
-  mediakey_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.mediakey_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline const std::string& AudioMessage::mediakey() const {
   // @@protoc_insertion_point(field_get:proto.AudioMessage.mediaKey)
@@ -31079,8 +32275,8 @@ inline const std::string& AudioMessage::mediakey() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void AudioMessage::set_mediakey(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000008u;
- mediakey_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000008u;
+ _impl_.mediakey_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.AudioMessage.mediaKey)
 }
 inline std::string* AudioMessage::mutable_mediakey() {
@@ -31089,46 +32285,56 @@ inline std::string* AudioMessage::mutable_mediakey() {
   return _s;
 }
 inline const std::string& AudioMessage::_internal_mediakey() const {
-  return mediakey_.Get();
+  return _impl_.mediakey_.Get();
 }
 inline void AudioMessage::_internal_set_mediakey(const std::string& value) {
-  _has_bits_[0] |= 0x00000008u;
-  mediakey_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.mediakey_.Set(value, GetArenaForAllocation());
 }
 inline std::string* AudioMessage::_internal_mutable_mediakey() {
-  _has_bits_[0] |= 0x00000008u;
-  return mediakey_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  return _impl_.mediakey_.Mutable(GetArenaForAllocation());
 }
 inline std::string* AudioMessage::release_mediakey() {
   // @@protoc_insertion_point(field_release:proto.AudioMessage.mediaKey)
   if (!_internal_has_mediakey()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000008u;
-  return mediakey_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  auto* p = _impl_.mediakey_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.mediakey_.IsDefault()) {
+    _impl_.mediakey_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void AudioMessage::set_allocated_mediakey(std::string* mediakey) {
   if (mediakey != nullptr) {
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
+  }
+  _impl_.mediakey_.SetAllocated(mediakey, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.mediakey_.IsDefault()) {
+    _impl_.mediakey_.Set("", GetArenaForAllocation());
   }
-  mediakey_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), mediakey,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.AudioMessage.mediaKey)
 }
 
 // optional bytes fileEncSha256 = 8;
 inline bool AudioMessage::_internal_has_fileencsha256() const {
-  bool value = (_has_bits_[0] & 0x00000010u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
   return value;
 }
 inline bool AudioMessage::has_fileencsha256() const {
   return _internal_has_fileencsha256();
 }
 inline void AudioMessage::clear_fileencsha256() {
-  fileencsha256_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000010u;
+  _impl_.fileencsha256_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000010u;
 }
 inline const std::string& AudioMessage::fileencsha256() const {
   // @@protoc_insertion_point(field_get:proto.AudioMessage.fileEncSha256)
@@ -31137,8 +32343,8 @@ inline const std::string& AudioMessage::fileencsha256() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void AudioMessage::set_fileencsha256(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000010u;
- fileencsha256_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000010u;
+ _impl_.fileencsha256_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.AudioMessage.fileEncSha256)
 }
 inline std::string* AudioMessage::mutable_fileencsha256() {
@@ -31147,46 +32353,56 @@ inline std::string* AudioMessage::mutable_fileencsha256() {
   return _s;
 }
 inline const std::string& AudioMessage::_internal_fileencsha256() const {
-  return fileencsha256_.Get();
+  return _impl_.fileencsha256_.Get();
 }
 inline void AudioMessage::_internal_set_fileencsha256(const std::string& value) {
-  _has_bits_[0] |= 0x00000010u;
-  fileencsha256_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  _impl_.fileencsha256_.Set(value, GetArenaForAllocation());
 }
 inline std::string* AudioMessage::_internal_mutable_fileencsha256() {
-  _has_bits_[0] |= 0x00000010u;
-  return fileencsha256_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  return _impl_.fileencsha256_.Mutable(GetArenaForAllocation());
 }
 inline std::string* AudioMessage::release_fileencsha256() {
   // @@protoc_insertion_point(field_release:proto.AudioMessage.fileEncSha256)
   if (!_internal_has_fileencsha256()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000010u;
-  return fileencsha256_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000010u;
+  auto* p = _impl_.fileencsha256_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.fileencsha256_.IsDefault()) {
+    _impl_.fileencsha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void AudioMessage::set_allocated_fileencsha256(std::string* fileencsha256) {
   if (fileencsha256 != nullptr) {
-    _has_bits_[0] |= 0x00000010u;
+    _impl_._has_bits_[0] |= 0x00000010u;
   } else {
-    _has_bits_[0] &= ~0x00000010u;
+    _impl_._has_bits_[0] &= ~0x00000010u;
   }
-  fileencsha256_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), fileencsha256,
-      GetArenaForAllocation());
+  _impl_.fileencsha256_.SetAllocated(fileencsha256, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.fileencsha256_.IsDefault()) {
+    _impl_.fileencsha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.AudioMessage.fileEncSha256)
 }
 
 // optional string directPath = 9;
 inline bool AudioMessage::_internal_has_directpath() const {
-  bool value = (_has_bits_[0] & 0x00000020u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
   return value;
 }
 inline bool AudioMessage::has_directpath() const {
   return _internal_has_directpath();
 }
 inline void AudioMessage::clear_directpath() {
-  directpath_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000020u;
+  _impl_.directpath_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000020u;
 }
 inline const std::string& AudioMessage::directpath() const {
   // @@protoc_insertion_point(field_get:proto.AudioMessage.directPath)
@@ -31195,8 +32411,8 @@ inline const std::string& AudioMessage::directpath() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void AudioMessage::set_directpath(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000020u;
- directpath_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000020u;
+ _impl_.directpath_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.AudioMessage.directPath)
 }
 inline std::string* AudioMessage::mutable_directpath() {
@@ -31205,78 +32421,88 @@ inline std::string* AudioMessage::mutable_directpath() {
   return _s;
 }
 inline const std::string& AudioMessage::_internal_directpath() const {
-  return directpath_.Get();
+  return _impl_.directpath_.Get();
 }
 inline void AudioMessage::_internal_set_directpath(const std::string& value) {
-  _has_bits_[0] |= 0x00000020u;
-  directpath_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000020u;
+  _impl_.directpath_.Set(value, GetArenaForAllocation());
 }
 inline std::string* AudioMessage::_internal_mutable_directpath() {
-  _has_bits_[0] |= 0x00000020u;
-  return directpath_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000020u;
+  return _impl_.directpath_.Mutable(GetArenaForAllocation());
 }
 inline std::string* AudioMessage::release_directpath() {
   // @@protoc_insertion_point(field_release:proto.AudioMessage.directPath)
   if (!_internal_has_directpath()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000020u;
-  return directpath_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000020u;
+  auto* p = _impl_.directpath_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.directpath_.IsDefault()) {
+    _impl_.directpath_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void AudioMessage::set_allocated_directpath(std::string* directpath) {
   if (directpath != nullptr) {
-    _has_bits_[0] |= 0x00000020u;
+    _impl_._has_bits_[0] |= 0x00000020u;
   } else {
-    _has_bits_[0] &= ~0x00000020u;
+    _impl_._has_bits_[0] &= ~0x00000020u;
   }
-  directpath_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), directpath,
-      GetArenaForAllocation());
+  _impl_.directpath_.SetAllocated(directpath, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.directpath_.IsDefault()) {
+    _impl_.directpath_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.AudioMessage.directPath)
 }
 
 // optional int64 mediaKeyTimestamp = 10;
 inline bool AudioMessage::_internal_has_mediakeytimestamp() const {
-  bool value = (_has_bits_[0] & 0x00000800u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000800u) != 0;
   return value;
 }
 inline bool AudioMessage::has_mediakeytimestamp() const {
   return _internal_has_mediakeytimestamp();
 }
 inline void AudioMessage::clear_mediakeytimestamp() {
-  mediakeytimestamp_ = int64_t{0};
-  _has_bits_[0] &= ~0x00000800u;
+  _impl_.mediakeytimestamp_ = int64_t{0};
+  _impl_._has_bits_[0] &= ~0x00000800u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 AudioMessage::_internal_mediakeytimestamp() const {
-  return mediakeytimestamp_;
+inline int64_t AudioMessage::_internal_mediakeytimestamp() const {
+  return _impl_.mediakeytimestamp_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 AudioMessage::mediakeytimestamp() const {
+inline int64_t AudioMessage::mediakeytimestamp() const {
   // @@protoc_insertion_point(field_get:proto.AudioMessage.mediaKeyTimestamp)
   return _internal_mediakeytimestamp();
 }
-inline void AudioMessage::_internal_set_mediakeytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value) {
-  _has_bits_[0] |= 0x00000800u;
-  mediakeytimestamp_ = value;
+inline void AudioMessage::_internal_set_mediakeytimestamp(int64_t value) {
+  _impl_._has_bits_[0] |= 0x00000800u;
+  _impl_.mediakeytimestamp_ = value;
 }
-inline void AudioMessage::set_mediakeytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value) {
+inline void AudioMessage::set_mediakeytimestamp(int64_t value) {
   _internal_set_mediakeytimestamp(value);
   // @@protoc_insertion_point(field_set:proto.AudioMessage.mediaKeyTimestamp)
 }
 
 // optional .proto.ContextInfo contextInfo = 17;
 inline bool AudioMessage::_internal_has_contextinfo() const {
-  bool value = (_has_bits_[0] & 0x00000080u) != 0;
-  PROTOBUF_ASSUME(!value || contextinfo_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000080u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.contextinfo_ != nullptr);
   return value;
 }
 inline bool AudioMessage::has_contextinfo() const {
   return _internal_has_contextinfo();
 }
 inline void AudioMessage::clear_contextinfo() {
-  if (contextinfo_ != nullptr) contextinfo_->Clear();
-  _has_bits_[0] &= ~0x00000080u;
+  if (_impl_.contextinfo_ != nullptr) _impl_.contextinfo_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000080u;
 }
 inline const ::proto::ContextInfo& AudioMessage::_internal_contextinfo() const {
-  const ::proto::ContextInfo* p = contextinfo_;
+  const ::proto::ContextInfo* p = _impl_.contextinfo_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ContextInfo&>(
       ::proto::_ContextInfo_default_instance_);
 }
@@ -31287,20 +32513,20 @@ inline const ::proto::ContextInfo& AudioMessage::contextinfo() const {
 inline void AudioMessage::unsafe_arena_set_allocated_contextinfo(
     ::proto::ContextInfo* contextinfo) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(contextinfo_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.contextinfo_);
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   if (contextinfo) {
-    _has_bits_[0] |= 0x00000080u;
+    _impl_._has_bits_[0] |= 0x00000080u;
   } else {
-    _has_bits_[0] &= ~0x00000080u;
+    _impl_._has_bits_[0] &= ~0x00000080u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.AudioMessage.contextInfo)
 }
 inline ::proto::ContextInfo* AudioMessage::release_contextinfo() {
-  _has_bits_[0] &= ~0x00000080u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000080u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -31314,18 +32540,18 @@ inline ::proto::ContextInfo* AudioMessage::release_contextinfo() {
 }
 inline ::proto::ContextInfo* AudioMessage::unsafe_arena_release_contextinfo() {
   // @@protoc_insertion_point(field_release:proto.AudioMessage.contextInfo)
-  _has_bits_[0] &= ~0x00000080u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000080u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
   return temp;
 }
 inline ::proto::ContextInfo* AudioMessage::_internal_mutable_contextinfo() {
-  _has_bits_[0] |= 0x00000080u;
-  if (contextinfo_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000080u;
+  if (_impl_.contextinfo_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ContextInfo>(GetArenaForAllocation());
-    contextinfo_ = p;
+    _impl_.contextinfo_ = p;
   }
-  return contextinfo_;
+  return _impl_.contextinfo_;
 }
 inline ::proto::ContextInfo* AudioMessage::mutable_contextinfo() {
   ::proto::ContextInfo* _msg = _internal_mutable_contextinfo();
@@ -31335,34 +32561,34 @@ inline ::proto::ContextInfo* AudioMessage::mutable_contextinfo() {
 inline void AudioMessage::set_allocated_contextinfo(::proto::ContextInfo* contextinfo) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete contextinfo_;
+    delete _impl_.contextinfo_;
   }
   if (contextinfo) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ContextInfo>::GetOwningArena(contextinfo);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(contextinfo);
     if (message_arena != submessage_arena) {
       contextinfo = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, contextinfo, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000080u;
+    _impl_._has_bits_[0] |= 0x00000080u;
   } else {
-    _has_bits_[0] &= ~0x00000080u;
+    _impl_._has_bits_[0] &= ~0x00000080u;
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   // @@protoc_insertion_point(field_set_allocated:proto.AudioMessage.contextInfo)
 }
 
 // optional bytes streamingSidecar = 18;
 inline bool AudioMessage::_internal_has_streamingsidecar() const {
-  bool value = (_has_bits_[0] & 0x00000040u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
   return value;
 }
 inline bool AudioMessage::has_streamingsidecar() const {
   return _internal_has_streamingsidecar();
 }
 inline void AudioMessage::clear_streamingsidecar() {
-  streamingsidecar_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000040u;
+  _impl_.streamingsidecar_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000040u;
 }
 inline const std::string& AudioMessage::streamingsidecar() const {
   // @@protoc_insertion_point(field_get:proto.AudioMessage.streamingSidecar)
@@ -31371,8 +32597,8 @@ inline const std::string& AudioMessage::streamingsidecar() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void AudioMessage::set_streamingsidecar(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000040u;
- streamingsidecar_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000040u;
+ _impl_.streamingsidecar_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.AudioMessage.streamingSidecar)
 }
 inline std::string* AudioMessage::mutable_streamingsidecar() {
@@ -31381,32 +32607,42 @@ inline std::string* AudioMessage::mutable_streamingsidecar() {
   return _s;
 }
 inline const std::string& AudioMessage::_internal_streamingsidecar() const {
-  return streamingsidecar_.Get();
+  return _impl_.streamingsidecar_.Get();
 }
 inline void AudioMessage::_internal_set_streamingsidecar(const std::string& value) {
-  _has_bits_[0] |= 0x00000040u;
-  streamingsidecar_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000040u;
+  _impl_.streamingsidecar_.Set(value, GetArenaForAllocation());
 }
 inline std::string* AudioMessage::_internal_mutable_streamingsidecar() {
-  _has_bits_[0] |= 0x00000040u;
-  return streamingsidecar_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000040u;
+  return _impl_.streamingsidecar_.Mutable(GetArenaForAllocation());
 }
 inline std::string* AudioMessage::release_streamingsidecar() {
   // @@protoc_insertion_point(field_release:proto.AudioMessage.streamingSidecar)
   if (!_internal_has_streamingsidecar()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000040u;
-  return streamingsidecar_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000040u;
+  auto* p = _impl_.streamingsidecar_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.streamingsidecar_.IsDefault()) {
+    _impl_.streamingsidecar_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void AudioMessage::set_allocated_streamingsidecar(std::string* streamingsidecar) {
   if (streamingsidecar != nullptr) {
-    _has_bits_[0] |= 0x00000040u;
+    _impl_._has_bits_[0] |= 0x00000040u;
   } else {
-    _has_bits_[0] &= ~0x00000040u;
+    _impl_._has_bits_[0] &= ~0x00000040u;
   }
-  streamingsidecar_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), streamingsidecar,
-      GetArenaForAllocation());
+  _impl_.streamingsidecar_.SetAllocated(streamingsidecar, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.streamingsidecar_.IsDefault()) {
+    _impl_.streamingsidecar_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.AudioMessage.streamingSidecar)
 }
 
@@ -31416,15 +32652,15 @@ inline void AudioMessage::set_allocated_streamingsidecar(std::string* streamings
 
 // optional string url = 1;
 inline bool VideoMessage::_internal_has_url() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool VideoMessage::has_url() const {
   return _internal_has_url();
 }
 inline void VideoMessage::clear_url() {
-  url_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.url_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& VideoMessage::url() const {
   // @@protoc_insertion_point(field_get:proto.VideoMessage.url)
@@ -31433,8 +32669,8 @@ inline const std::string& VideoMessage::url() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void VideoMessage::set_url(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- url_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.url_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.VideoMessage.url)
 }
 inline std::string* VideoMessage::mutable_url() {
@@ -31443,46 +32679,56 @@ inline std::string* VideoMessage::mutable_url() {
   return _s;
 }
 inline const std::string& VideoMessage::_internal_url() const {
-  return url_.Get();
+  return _impl_.url_.Get();
 }
 inline void VideoMessage::_internal_set_url(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  url_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.url_.Set(value, GetArenaForAllocation());
 }
 inline std::string* VideoMessage::_internal_mutable_url() {
-  _has_bits_[0] |= 0x00000001u;
-  return url_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.url_.Mutable(GetArenaForAllocation());
 }
 inline std::string* VideoMessage::release_url() {
   // @@protoc_insertion_point(field_release:proto.VideoMessage.url)
   if (!_internal_has_url()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return url_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.url_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.url_.IsDefault()) {
+    _impl_.url_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void VideoMessage::set_allocated_url(std::string* url) {
   if (url != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  url_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), url,
-      GetArenaForAllocation());
+  _impl_.url_.SetAllocated(url, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.url_.IsDefault()) {
+    _impl_.url_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.VideoMessage.url)
 }
 
 // optional string mimetype = 2;
 inline bool VideoMessage::_internal_has_mimetype() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool VideoMessage::has_mimetype() const {
   return _internal_has_mimetype();
 }
 inline void VideoMessage::clear_mimetype() {
-  mimetype_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.mimetype_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& VideoMessage::mimetype() const {
   // @@protoc_insertion_point(field_get:proto.VideoMessage.mimetype)
@@ -31491,8 +32737,8 @@ inline const std::string& VideoMessage::mimetype() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void VideoMessage::set_mimetype(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- mimetype_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.mimetype_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.VideoMessage.mimetype)
 }
 inline std::string* VideoMessage::mutable_mimetype() {
@@ -31501,46 +32747,56 @@ inline std::string* VideoMessage::mutable_mimetype() {
   return _s;
 }
 inline const std::string& VideoMessage::_internal_mimetype() const {
-  return mimetype_.Get();
+  return _impl_.mimetype_.Get();
 }
 inline void VideoMessage::_internal_set_mimetype(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  mimetype_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.mimetype_.Set(value, GetArenaForAllocation());
 }
 inline std::string* VideoMessage::_internal_mutable_mimetype() {
-  _has_bits_[0] |= 0x00000002u;
-  return mimetype_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.mimetype_.Mutable(GetArenaForAllocation());
 }
 inline std::string* VideoMessage::release_mimetype() {
   // @@protoc_insertion_point(field_release:proto.VideoMessage.mimetype)
   if (!_internal_has_mimetype()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return mimetype_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.mimetype_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.mimetype_.IsDefault()) {
+    _impl_.mimetype_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void VideoMessage::set_allocated_mimetype(std::string* mimetype) {
   if (mimetype != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  mimetype_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), mimetype,
-      GetArenaForAllocation());
+  _impl_.mimetype_.SetAllocated(mimetype, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.mimetype_.IsDefault()) {
+    _impl_.mimetype_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.VideoMessage.mimetype)
 }
 
 // optional bytes fileSha256 = 3;
 inline bool VideoMessage::_internal_has_filesha256() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool VideoMessage::has_filesha256() const {
   return _internal_has_filesha256();
 }
 inline void VideoMessage::clear_filesha256() {
-  filesha256_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.filesha256_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const std::string& VideoMessage::filesha256() const {
   // @@protoc_insertion_point(field_get:proto.VideoMessage.fileSha256)
@@ -31549,8 +32805,8 @@ inline const std::string& VideoMessage::filesha256() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void VideoMessage::set_filesha256(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000004u;
- filesha256_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000004u;
+ _impl_.filesha256_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.VideoMessage.fileSha256)
 }
 inline std::string* VideoMessage::mutable_filesha256() {
@@ -31559,102 +32815,112 @@ inline std::string* VideoMessage::mutable_filesha256() {
   return _s;
 }
 inline const std::string& VideoMessage::_internal_filesha256() const {
-  return filesha256_.Get();
+  return _impl_.filesha256_.Get();
 }
 inline void VideoMessage::_internal_set_filesha256(const std::string& value) {
-  _has_bits_[0] |= 0x00000004u;
-  filesha256_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.filesha256_.Set(value, GetArenaForAllocation());
 }
 inline std::string* VideoMessage::_internal_mutable_filesha256() {
-  _has_bits_[0] |= 0x00000004u;
-  return filesha256_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  return _impl_.filesha256_.Mutable(GetArenaForAllocation());
 }
 inline std::string* VideoMessage::release_filesha256() {
   // @@protoc_insertion_point(field_release:proto.VideoMessage.fileSha256)
   if (!_internal_has_filesha256()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000004u;
-  return filesha256_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  auto* p = _impl_.filesha256_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.filesha256_.IsDefault()) {
+    _impl_.filesha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void VideoMessage::set_allocated_filesha256(std::string* filesha256) {
   if (filesha256 != nullptr) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
-  filesha256_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), filesha256,
-      GetArenaForAllocation());
+  _impl_.filesha256_.SetAllocated(filesha256, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.filesha256_.IsDefault()) {
+    _impl_.filesha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.VideoMessage.fileSha256)
 }
 
 // optional uint64 fileLength = 4;
 inline bool VideoMessage::_internal_has_filelength() const {
-  bool value = (_has_bits_[0] & 0x00002000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00002000u) != 0;
   return value;
 }
 inline bool VideoMessage::has_filelength() const {
   return _internal_has_filelength();
 }
 inline void VideoMessage::clear_filelength() {
-  filelength_ = uint64_t{0u};
-  _has_bits_[0] &= ~0x00002000u;
+  _impl_.filelength_ = uint64_t{0u};
+  _impl_._has_bits_[0] &= ~0x00002000u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 VideoMessage::_internal_filelength() const {
-  return filelength_;
+inline uint64_t VideoMessage::_internal_filelength() const {
+  return _impl_.filelength_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 VideoMessage::filelength() const {
+inline uint64_t VideoMessage::filelength() const {
   // @@protoc_insertion_point(field_get:proto.VideoMessage.fileLength)
   return _internal_filelength();
 }
-inline void VideoMessage::_internal_set_filelength(::PROTOBUF_NAMESPACE_ID::uint64 value) {
-  _has_bits_[0] |= 0x00002000u;
-  filelength_ = value;
+inline void VideoMessage::_internal_set_filelength(uint64_t value) {
+  _impl_._has_bits_[0] |= 0x00002000u;
+  _impl_.filelength_ = value;
 }
-inline void VideoMessage::set_filelength(::PROTOBUF_NAMESPACE_ID::uint64 value) {
+inline void VideoMessage::set_filelength(uint64_t value) {
   _internal_set_filelength(value);
   // @@protoc_insertion_point(field_set:proto.VideoMessage.fileLength)
 }
 
 // optional uint32 seconds = 5;
 inline bool VideoMessage::_internal_has_seconds() const {
-  bool value = (_has_bits_[0] & 0x00004000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00004000u) != 0;
   return value;
 }
 inline bool VideoMessage::has_seconds() const {
   return _internal_has_seconds();
 }
 inline void VideoMessage::clear_seconds() {
-  seconds_ = 0u;
-  _has_bits_[0] &= ~0x00004000u;
+  _impl_.seconds_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00004000u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 VideoMessage::_internal_seconds() const {
-  return seconds_;
+inline uint32_t VideoMessage::_internal_seconds() const {
+  return _impl_.seconds_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 VideoMessage::seconds() const {
+inline uint32_t VideoMessage::seconds() const {
   // @@protoc_insertion_point(field_get:proto.VideoMessage.seconds)
   return _internal_seconds();
 }
-inline void VideoMessage::_internal_set_seconds(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00004000u;
-  seconds_ = value;
+inline void VideoMessage::_internal_set_seconds(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00004000u;
+  _impl_.seconds_ = value;
 }
-inline void VideoMessage::set_seconds(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void VideoMessage::set_seconds(uint32_t value) {
   _internal_set_seconds(value);
   // @@protoc_insertion_point(field_set:proto.VideoMessage.seconds)
 }
 
 // optional bytes mediaKey = 6;
 inline bool VideoMessage::_internal_has_mediakey() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool VideoMessage::has_mediakey() const {
   return _internal_has_mediakey();
 }
 inline void VideoMessage::clear_mediakey() {
-  mediakey_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.mediakey_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline const std::string& VideoMessage::mediakey() const {
   // @@protoc_insertion_point(field_get:proto.VideoMessage.mediaKey)
@@ -31663,8 +32929,8 @@ inline const std::string& VideoMessage::mediakey() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void VideoMessage::set_mediakey(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000008u;
- mediakey_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000008u;
+ _impl_.mediakey_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.VideoMessage.mediaKey)
 }
 inline std::string* VideoMessage::mutable_mediakey() {
@@ -31673,46 +32939,56 @@ inline std::string* VideoMessage::mutable_mediakey() {
   return _s;
 }
 inline const std::string& VideoMessage::_internal_mediakey() const {
-  return mediakey_.Get();
+  return _impl_.mediakey_.Get();
 }
 inline void VideoMessage::_internal_set_mediakey(const std::string& value) {
-  _has_bits_[0] |= 0x00000008u;
-  mediakey_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.mediakey_.Set(value, GetArenaForAllocation());
 }
 inline std::string* VideoMessage::_internal_mutable_mediakey() {
-  _has_bits_[0] |= 0x00000008u;
-  return mediakey_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  return _impl_.mediakey_.Mutable(GetArenaForAllocation());
 }
 inline std::string* VideoMessage::release_mediakey() {
   // @@protoc_insertion_point(field_release:proto.VideoMessage.mediaKey)
   if (!_internal_has_mediakey()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000008u;
-  return mediakey_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  auto* p = _impl_.mediakey_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.mediakey_.IsDefault()) {
+    _impl_.mediakey_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void VideoMessage::set_allocated_mediakey(std::string* mediakey) {
   if (mediakey != nullptr) {
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
   }
-  mediakey_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), mediakey,
-      GetArenaForAllocation());
+  _impl_.mediakey_.SetAllocated(mediakey, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.mediakey_.IsDefault()) {
+    _impl_.mediakey_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.VideoMessage.mediaKey)
 }
 
 // optional string caption = 7;
 inline bool VideoMessage::_internal_has_caption() const {
-  bool value = (_has_bits_[0] & 0x00000010u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
   return value;
 }
 inline bool VideoMessage::has_caption() const {
   return _internal_has_caption();
 }
 inline void VideoMessage::clear_caption() {
-  caption_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000010u;
+  _impl_.caption_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000010u;
 }
 inline const std::string& VideoMessage::caption() const {
   // @@protoc_insertion_point(field_get:proto.VideoMessage.caption)
@@ -31721,8 +32997,8 @@ inline const std::string& VideoMessage::caption() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void VideoMessage::set_caption(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000010u;
- caption_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000010u;
+ _impl_.caption_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.VideoMessage.caption)
 }
 inline std::string* VideoMessage::mutable_caption() {
@@ -31731,57 +33007,67 @@ inline std::string* VideoMessage::mutable_caption() {
   return _s;
 }
 inline const std::string& VideoMessage::_internal_caption() const {
-  return caption_.Get();
+  return _impl_.caption_.Get();
 }
 inline void VideoMessage::_internal_set_caption(const std::string& value) {
-  _has_bits_[0] |= 0x00000010u;
-  caption_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  _impl_.caption_.Set(value, GetArenaForAllocation());
 }
 inline std::string* VideoMessage::_internal_mutable_caption() {
-  _has_bits_[0] |= 0x00000010u;
-  return caption_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  return _impl_.caption_.Mutable(GetArenaForAllocation());
 }
 inline std::string* VideoMessage::release_caption() {
   // @@protoc_insertion_point(field_release:proto.VideoMessage.caption)
   if (!_internal_has_caption()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000010u;
-  return caption_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000010u;
+  auto* p = _impl_.caption_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.caption_.IsDefault()) {
+    _impl_.caption_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void VideoMessage::set_allocated_caption(std::string* caption) {
   if (caption != nullptr) {
-    _has_bits_[0] |= 0x00000010u;
+    _impl_._has_bits_[0] |= 0x00000010u;
   } else {
-    _has_bits_[0] &= ~0x00000010u;
+    _impl_._has_bits_[0] &= ~0x00000010u;
+  }
+  _impl_.caption_.SetAllocated(caption, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.caption_.IsDefault()) {
+    _impl_.caption_.Set("", GetArenaForAllocation());
   }
-  caption_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), caption,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.VideoMessage.caption)
 }
 
 // optional bool gifPlayback = 8;
 inline bool VideoMessage::_internal_has_gifplayback() const {
-  bool value = (_has_bits_[0] & 0x00020000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00020000u) != 0;
   return value;
 }
 inline bool VideoMessage::has_gifplayback() const {
   return _internal_has_gifplayback();
 }
 inline void VideoMessage::clear_gifplayback() {
-  gifplayback_ = false;
-  _has_bits_[0] &= ~0x00020000u;
+  _impl_.gifplayback_ = false;
+  _impl_._has_bits_[0] &= ~0x00020000u;
 }
 inline bool VideoMessage::_internal_gifplayback() const {
-  return gifplayback_;
+  return _impl_.gifplayback_;
 }
 inline bool VideoMessage::gifplayback() const {
   // @@protoc_insertion_point(field_get:proto.VideoMessage.gifPlayback)
   return _internal_gifplayback();
 }
 inline void VideoMessage::_internal_set_gifplayback(bool value) {
-  _has_bits_[0] |= 0x00020000u;
-  gifplayback_ = value;
+  _impl_._has_bits_[0] |= 0x00020000u;
+  _impl_.gifplayback_ = value;
 }
 inline void VideoMessage::set_gifplayback(bool value) {
   _internal_set_gifplayback(value);
@@ -31790,71 +33076,71 @@ inline void VideoMessage::set_gifplayback(bool value) {
 
 // optional uint32 height = 9;
 inline bool VideoMessage::_internal_has_height() const {
-  bool value = (_has_bits_[0] & 0x00008000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00008000u) != 0;
   return value;
 }
 inline bool VideoMessage::has_height() const {
   return _internal_has_height();
 }
 inline void VideoMessage::clear_height() {
-  height_ = 0u;
-  _has_bits_[0] &= ~0x00008000u;
+  _impl_.height_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00008000u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 VideoMessage::_internal_height() const {
-  return height_;
+inline uint32_t VideoMessage::_internal_height() const {
+  return _impl_.height_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 VideoMessage::height() const {
+inline uint32_t VideoMessage::height() const {
   // @@protoc_insertion_point(field_get:proto.VideoMessage.height)
   return _internal_height();
 }
-inline void VideoMessage::_internal_set_height(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00008000u;
-  height_ = value;
+inline void VideoMessage::_internal_set_height(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00008000u;
+  _impl_.height_ = value;
 }
-inline void VideoMessage::set_height(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void VideoMessage::set_height(uint32_t value) {
   _internal_set_height(value);
   // @@protoc_insertion_point(field_set:proto.VideoMessage.height)
 }
 
 // optional uint32 width = 10;
 inline bool VideoMessage::_internal_has_width() const {
-  bool value = (_has_bits_[0] & 0x00010000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00010000u) != 0;
   return value;
 }
 inline bool VideoMessage::has_width() const {
   return _internal_has_width();
 }
 inline void VideoMessage::clear_width() {
-  width_ = 0u;
-  _has_bits_[0] &= ~0x00010000u;
+  _impl_.width_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00010000u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 VideoMessage::_internal_width() const {
-  return width_;
+inline uint32_t VideoMessage::_internal_width() const {
+  return _impl_.width_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 VideoMessage::width() const {
+inline uint32_t VideoMessage::width() const {
   // @@protoc_insertion_point(field_get:proto.VideoMessage.width)
   return _internal_width();
 }
-inline void VideoMessage::_internal_set_width(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00010000u;
-  width_ = value;
+inline void VideoMessage::_internal_set_width(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00010000u;
+  _impl_.width_ = value;
 }
-inline void VideoMessage::set_width(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void VideoMessage::set_width(uint32_t value) {
   _internal_set_width(value);
   // @@protoc_insertion_point(field_set:proto.VideoMessage.width)
 }
 
 // optional bytes fileEncSha256 = 11;
 inline bool VideoMessage::_internal_has_fileencsha256() const {
-  bool value = (_has_bits_[0] & 0x00000020u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
   return value;
 }
 inline bool VideoMessage::has_fileencsha256() const {
   return _internal_has_fileencsha256();
 }
 inline void VideoMessage::clear_fileencsha256() {
-  fileencsha256_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000020u;
+  _impl_.fileencsha256_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000020u;
 }
 inline const std::string& VideoMessage::fileencsha256() const {
   // @@protoc_insertion_point(field_get:proto.VideoMessage.fileEncSha256)
@@ -31863,8 +33149,8 @@ inline const std::string& VideoMessage::fileencsha256() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void VideoMessage::set_fileencsha256(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000020u;
- fileencsha256_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000020u;
+ _impl_.fileencsha256_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.VideoMessage.fileEncSha256)
 }
 inline std::string* VideoMessage::mutable_fileencsha256() {
@@ -31873,63 +33159,73 @@ inline std::string* VideoMessage::mutable_fileencsha256() {
   return _s;
 }
 inline const std::string& VideoMessage::_internal_fileencsha256() const {
-  return fileencsha256_.Get();
+  return _impl_.fileencsha256_.Get();
 }
 inline void VideoMessage::_internal_set_fileencsha256(const std::string& value) {
-  _has_bits_[0] |= 0x00000020u;
-  fileencsha256_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000020u;
+  _impl_.fileencsha256_.Set(value, GetArenaForAllocation());
 }
 inline std::string* VideoMessage::_internal_mutable_fileencsha256() {
-  _has_bits_[0] |= 0x00000020u;
-  return fileencsha256_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000020u;
+  return _impl_.fileencsha256_.Mutable(GetArenaForAllocation());
 }
 inline std::string* VideoMessage::release_fileencsha256() {
   // @@protoc_insertion_point(field_release:proto.VideoMessage.fileEncSha256)
   if (!_internal_has_fileencsha256()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000020u;
-  return fileencsha256_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000020u;
+  auto* p = _impl_.fileencsha256_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.fileencsha256_.IsDefault()) {
+    _impl_.fileencsha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void VideoMessage::set_allocated_fileencsha256(std::string* fileencsha256) {
   if (fileencsha256 != nullptr) {
-    _has_bits_[0] |= 0x00000020u;
+    _impl_._has_bits_[0] |= 0x00000020u;
   } else {
-    _has_bits_[0] &= ~0x00000020u;
+    _impl_._has_bits_[0] &= ~0x00000020u;
+  }
+  _impl_.fileencsha256_.SetAllocated(fileencsha256, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.fileencsha256_.IsDefault()) {
+    _impl_.fileencsha256_.Set("", GetArenaForAllocation());
   }
-  fileencsha256_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), fileencsha256,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.VideoMessage.fileEncSha256)
 }
 
 // repeated .proto.InteractiveAnnotation interactiveAnnotations = 12;
 inline int VideoMessage::_internal_interactiveannotations_size() const {
-  return interactiveannotations_.size();
+  return _impl_.interactiveannotations_.size();
 }
 inline int VideoMessage::interactiveannotations_size() const {
   return _internal_interactiveannotations_size();
 }
 inline void VideoMessage::clear_interactiveannotations() {
-  interactiveannotations_.Clear();
+  _impl_.interactiveannotations_.Clear();
 }
 inline ::proto::InteractiveAnnotation* VideoMessage::mutable_interactiveannotations(int index) {
   // @@protoc_insertion_point(field_mutable:proto.VideoMessage.interactiveAnnotations)
-  return interactiveannotations_.Mutable(index);
+  return _impl_.interactiveannotations_.Mutable(index);
 }
 inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::InteractiveAnnotation >*
 VideoMessage::mutable_interactiveannotations() {
   // @@protoc_insertion_point(field_mutable_list:proto.VideoMessage.interactiveAnnotations)
-  return &interactiveannotations_;
+  return &_impl_.interactiveannotations_;
 }
 inline const ::proto::InteractiveAnnotation& VideoMessage::_internal_interactiveannotations(int index) const {
-  return interactiveannotations_.Get(index);
+  return _impl_.interactiveannotations_.Get(index);
 }
 inline const ::proto::InteractiveAnnotation& VideoMessage::interactiveannotations(int index) const {
   // @@protoc_insertion_point(field_get:proto.VideoMessage.interactiveAnnotations)
   return _internal_interactiveannotations(index);
 }
 inline ::proto::InteractiveAnnotation* VideoMessage::_internal_add_interactiveannotations() {
-  return interactiveannotations_.Add();
+  return _impl_.interactiveannotations_.Add();
 }
 inline ::proto::InteractiveAnnotation* VideoMessage::add_interactiveannotations() {
   ::proto::InteractiveAnnotation* _add = _internal_add_interactiveannotations();
@@ -31939,20 +33235,20 @@ inline ::proto::InteractiveAnnotation* VideoMessage::add_interactiveannotations(
 inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::InteractiveAnnotation >&
 VideoMessage::interactiveannotations() const {
   // @@protoc_insertion_point(field_list:proto.VideoMessage.interactiveAnnotations)
-  return interactiveannotations_;
+  return _impl_.interactiveannotations_;
 }
 
 // optional string directPath = 13;
 inline bool VideoMessage::_internal_has_directpath() const {
-  bool value = (_has_bits_[0] & 0x00000040u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
   return value;
 }
 inline bool VideoMessage::has_directpath() const {
   return _internal_has_directpath();
 }
 inline void VideoMessage::clear_directpath() {
-  directpath_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000040u;
+  _impl_.directpath_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000040u;
 }
 inline const std::string& VideoMessage::directpath() const {
   // @@protoc_insertion_point(field_get:proto.VideoMessage.directPath)
@@ -31961,8 +33257,8 @@ inline const std::string& VideoMessage::directpath() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void VideoMessage::set_directpath(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000040u;
- directpath_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000040u;
+ _impl_.directpath_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.VideoMessage.directPath)
 }
 inline std::string* VideoMessage::mutable_directpath() {
@@ -31971,74 +33267,84 @@ inline std::string* VideoMessage::mutable_directpath() {
   return _s;
 }
 inline const std::string& VideoMessage::_internal_directpath() const {
-  return directpath_.Get();
+  return _impl_.directpath_.Get();
 }
 inline void VideoMessage::_internal_set_directpath(const std::string& value) {
-  _has_bits_[0] |= 0x00000040u;
-  directpath_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000040u;
+  _impl_.directpath_.Set(value, GetArenaForAllocation());
 }
 inline std::string* VideoMessage::_internal_mutable_directpath() {
-  _has_bits_[0] |= 0x00000040u;
-  return directpath_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000040u;
+  return _impl_.directpath_.Mutable(GetArenaForAllocation());
 }
 inline std::string* VideoMessage::release_directpath() {
   // @@protoc_insertion_point(field_release:proto.VideoMessage.directPath)
   if (!_internal_has_directpath()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000040u;
-  return directpath_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000040u;
+  auto* p = _impl_.directpath_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.directpath_.IsDefault()) {
+    _impl_.directpath_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void VideoMessage::set_allocated_directpath(std::string* directpath) {
   if (directpath != nullptr) {
-    _has_bits_[0] |= 0x00000040u;
+    _impl_._has_bits_[0] |= 0x00000040u;
   } else {
-    _has_bits_[0] &= ~0x00000040u;
+    _impl_._has_bits_[0] &= ~0x00000040u;
+  }
+  _impl_.directpath_.SetAllocated(directpath, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.directpath_.IsDefault()) {
+    _impl_.directpath_.Set("", GetArenaForAllocation());
   }
-  directpath_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), directpath,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.VideoMessage.directPath)
 }
 
 // optional int64 mediaKeyTimestamp = 14;
 inline bool VideoMessage::_internal_has_mediakeytimestamp() const {
-  bool value = (_has_bits_[0] & 0x00080000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00080000u) != 0;
   return value;
 }
 inline bool VideoMessage::has_mediakeytimestamp() const {
   return _internal_has_mediakeytimestamp();
 }
 inline void VideoMessage::clear_mediakeytimestamp() {
-  mediakeytimestamp_ = int64_t{0};
-  _has_bits_[0] &= ~0x00080000u;
+  _impl_.mediakeytimestamp_ = int64_t{0};
+  _impl_._has_bits_[0] &= ~0x00080000u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 VideoMessage::_internal_mediakeytimestamp() const {
-  return mediakeytimestamp_;
+inline int64_t VideoMessage::_internal_mediakeytimestamp() const {
+  return _impl_.mediakeytimestamp_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 VideoMessage::mediakeytimestamp() const {
+inline int64_t VideoMessage::mediakeytimestamp() const {
   // @@protoc_insertion_point(field_get:proto.VideoMessage.mediaKeyTimestamp)
   return _internal_mediakeytimestamp();
 }
-inline void VideoMessage::_internal_set_mediakeytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value) {
-  _has_bits_[0] |= 0x00080000u;
-  mediakeytimestamp_ = value;
+inline void VideoMessage::_internal_set_mediakeytimestamp(int64_t value) {
+  _impl_._has_bits_[0] |= 0x00080000u;
+  _impl_.mediakeytimestamp_ = value;
 }
-inline void VideoMessage::set_mediakeytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value) {
+inline void VideoMessage::set_mediakeytimestamp(int64_t value) {
   _internal_set_mediakeytimestamp(value);
   // @@protoc_insertion_point(field_set:proto.VideoMessage.mediaKeyTimestamp)
 }
 
 // optional bytes jpegThumbnail = 16;
 inline bool VideoMessage::_internal_has_jpegthumbnail() const {
-  bool value = (_has_bits_[0] & 0x00000080u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000080u) != 0;
   return value;
 }
 inline bool VideoMessage::has_jpegthumbnail() const {
   return _internal_has_jpegthumbnail();
 }
 inline void VideoMessage::clear_jpegthumbnail() {
-  jpegthumbnail_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000080u;
+  _impl_.jpegthumbnail_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000080u;
 }
 inline const std::string& VideoMessage::jpegthumbnail() const {
   // @@protoc_insertion_point(field_get:proto.VideoMessage.jpegThumbnail)
@@ -32047,8 +33353,8 @@ inline const std::string& VideoMessage::jpegthumbnail() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void VideoMessage::set_jpegthumbnail(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000080u;
- jpegthumbnail_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000080u;
+ _impl_.jpegthumbnail_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.VideoMessage.jpegThumbnail)
 }
 inline std::string* VideoMessage::mutable_jpegthumbnail() {
@@ -32057,50 +33363,60 @@ inline std::string* VideoMessage::mutable_jpegthumbnail() {
   return _s;
 }
 inline const std::string& VideoMessage::_internal_jpegthumbnail() const {
-  return jpegthumbnail_.Get();
+  return _impl_.jpegthumbnail_.Get();
 }
 inline void VideoMessage::_internal_set_jpegthumbnail(const std::string& value) {
-  _has_bits_[0] |= 0x00000080u;
-  jpegthumbnail_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000080u;
+  _impl_.jpegthumbnail_.Set(value, GetArenaForAllocation());
 }
 inline std::string* VideoMessage::_internal_mutable_jpegthumbnail() {
-  _has_bits_[0] |= 0x00000080u;
-  return jpegthumbnail_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000080u;
+  return _impl_.jpegthumbnail_.Mutable(GetArenaForAllocation());
 }
 inline std::string* VideoMessage::release_jpegthumbnail() {
   // @@protoc_insertion_point(field_release:proto.VideoMessage.jpegThumbnail)
   if (!_internal_has_jpegthumbnail()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000080u;
-  return jpegthumbnail_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000080u;
+  auto* p = _impl_.jpegthumbnail_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.jpegthumbnail_.IsDefault()) {
+    _impl_.jpegthumbnail_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void VideoMessage::set_allocated_jpegthumbnail(std::string* jpegthumbnail) {
   if (jpegthumbnail != nullptr) {
-    _has_bits_[0] |= 0x00000080u;
+    _impl_._has_bits_[0] |= 0x00000080u;
   } else {
-    _has_bits_[0] &= ~0x00000080u;
+    _impl_._has_bits_[0] &= ~0x00000080u;
+  }
+  _impl_.jpegthumbnail_.SetAllocated(jpegthumbnail, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.jpegthumbnail_.IsDefault()) {
+    _impl_.jpegthumbnail_.Set("", GetArenaForAllocation());
   }
-  jpegthumbnail_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), jpegthumbnail,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.VideoMessage.jpegThumbnail)
 }
 
 // optional .proto.ContextInfo contextInfo = 17;
 inline bool VideoMessage::_internal_has_contextinfo() const {
-  bool value = (_has_bits_[0] & 0x00001000u) != 0;
-  PROTOBUF_ASSUME(!value || contextinfo_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00001000u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.contextinfo_ != nullptr);
   return value;
 }
 inline bool VideoMessage::has_contextinfo() const {
   return _internal_has_contextinfo();
 }
 inline void VideoMessage::clear_contextinfo() {
-  if (contextinfo_ != nullptr) contextinfo_->Clear();
-  _has_bits_[0] &= ~0x00001000u;
+  if (_impl_.contextinfo_ != nullptr) _impl_.contextinfo_->Clear();
+  _impl_._has_bits_[0] &= ~0x00001000u;
 }
 inline const ::proto::ContextInfo& VideoMessage::_internal_contextinfo() const {
-  const ::proto::ContextInfo* p = contextinfo_;
+  const ::proto::ContextInfo* p = _impl_.contextinfo_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ContextInfo&>(
       ::proto::_ContextInfo_default_instance_);
 }
@@ -32111,20 +33427,20 @@ inline const ::proto::ContextInfo& VideoMessage::contextinfo() const {
 inline void VideoMessage::unsafe_arena_set_allocated_contextinfo(
     ::proto::ContextInfo* contextinfo) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(contextinfo_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.contextinfo_);
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   if (contextinfo) {
-    _has_bits_[0] |= 0x00001000u;
+    _impl_._has_bits_[0] |= 0x00001000u;
   } else {
-    _has_bits_[0] &= ~0x00001000u;
+    _impl_._has_bits_[0] &= ~0x00001000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.VideoMessage.contextInfo)
 }
 inline ::proto::ContextInfo* VideoMessage::release_contextinfo() {
-  _has_bits_[0] &= ~0x00001000u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00001000u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -32138,18 +33454,18 @@ inline ::proto::ContextInfo* VideoMessage::release_contextinfo() {
 }
 inline ::proto::ContextInfo* VideoMessage::unsafe_arena_release_contextinfo() {
   // @@protoc_insertion_point(field_release:proto.VideoMessage.contextInfo)
-  _has_bits_[0] &= ~0x00001000u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00001000u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
   return temp;
 }
 inline ::proto::ContextInfo* VideoMessage::_internal_mutable_contextinfo() {
-  _has_bits_[0] |= 0x00001000u;
-  if (contextinfo_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00001000u;
+  if (_impl_.contextinfo_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ContextInfo>(GetArenaForAllocation());
-    contextinfo_ = p;
+    _impl_.contextinfo_ = p;
   }
-  return contextinfo_;
+  return _impl_.contextinfo_;
 }
 inline ::proto::ContextInfo* VideoMessage::mutable_contextinfo() {
   ::proto::ContextInfo* _msg = _internal_mutable_contextinfo();
@@ -32159,34 +33475,34 @@ inline ::proto::ContextInfo* VideoMessage::mutable_contextinfo() {
 inline void VideoMessage::set_allocated_contextinfo(::proto::ContextInfo* contextinfo) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete contextinfo_;
+    delete _impl_.contextinfo_;
   }
   if (contextinfo) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ContextInfo>::GetOwningArena(contextinfo);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(contextinfo);
     if (message_arena != submessage_arena) {
       contextinfo = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, contextinfo, submessage_arena);
     }
-    _has_bits_[0] |= 0x00001000u;
+    _impl_._has_bits_[0] |= 0x00001000u;
   } else {
-    _has_bits_[0] &= ~0x00001000u;
+    _impl_._has_bits_[0] &= ~0x00001000u;
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   // @@protoc_insertion_point(field_set_allocated:proto.VideoMessage.contextInfo)
 }
 
 // optional bytes streamingSidecar = 18;
 inline bool VideoMessage::_internal_has_streamingsidecar() const {
-  bool value = (_has_bits_[0] & 0x00000100u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000100u) != 0;
   return value;
 }
 inline bool VideoMessage::has_streamingsidecar() const {
   return _internal_has_streamingsidecar();
 }
 inline void VideoMessage::clear_streamingsidecar() {
-  streamingsidecar_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000100u;
+  _impl_.streamingsidecar_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000100u;
 }
 inline const std::string& VideoMessage::streamingsidecar() const {
   // @@protoc_insertion_point(field_get:proto.VideoMessage.streamingSidecar)
@@ -32195,8 +33511,8 @@ inline const std::string& VideoMessage::streamingsidecar() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void VideoMessage::set_streamingsidecar(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000100u;
- streamingsidecar_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000100u;
+ _impl_.streamingsidecar_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.VideoMessage.streamingSidecar)
 }
 inline std::string* VideoMessage::mutable_streamingsidecar() {
@@ -32205,49 +33521,59 @@ inline std::string* VideoMessage::mutable_streamingsidecar() {
   return _s;
 }
 inline const std::string& VideoMessage::_internal_streamingsidecar() const {
-  return streamingsidecar_.Get();
+  return _impl_.streamingsidecar_.Get();
 }
 inline void VideoMessage::_internal_set_streamingsidecar(const std::string& value) {
-  _has_bits_[0] |= 0x00000100u;
-  streamingsidecar_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000100u;
+  _impl_.streamingsidecar_.Set(value, GetArenaForAllocation());
 }
 inline std::string* VideoMessage::_internal_mutable_streamingsidecar() {
-  _has_bits_[0] |= 0x00000100u;
-  return streamingsidecar_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000100u;
+  return _impl_.streamingsidecar_.Mutable(GetArenaForAllocation());
 }
 inline std::string* VideoMessage::release_streamingsidecar() {
   // @@protoc_insertion_point(field_release:proto.VideoMessage.streamingSidecar)
   if (!_internal_has_streamingsidecar()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000100u;
-  return streamingsidecar_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000100u;
+  auto* p = _impl_.streamingsidecar_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.streamingsidecar_.IsDefault()) {
+    _impl_.streamingsidecar_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void VideoMessage::set_allocated_streamingsidecar(std::string* streamingsidecar) {
   if (streamingsidecar != nullptr) {
-    _has_bits_[0] |= 0x00000100u;
+    _impl_._has_bits_[0] |= 0x00000100u;
   } else {
-    _has_bits_[0] &= ~0x00000100u;
+    _impl_._has_bits_[0] &= ~0x00000100u;
   }
-  streamingsidecar_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), streamingsidecar,
-      GetArenaForAllocation());
+  _impl_.streamingsidecar_.SetAllocated(streamingsidecar, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.streamingsidecar_.IsDefault()) {
+    _impl_.streamingsidecar_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.VideoMessage.streamingSidecar)
 }
 
 // optional .proto.VideoMessage.VideoMessageAttribution gifAttribution = 19;
 inline bool VideoMessage::_internal_has_gifattribution() const {
-  bool value = (_has_bits_[0] & 0x00100000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00100000u) != 0;
   return value;
 }
 inline bool VideoMessage::has_gifattribution() const {
   return _internal_has_gifattribution();
 }
 inline void VideoMessage::clear_gifattribution() {
-  gifattribution_ = 0;
-  _has_bits_[0] &= ~0x00100000u;
+  _impl_.gifattribution_ = 0;
+  _impl_._has_bits_[0] &= ~0x00100000u;
 }
 inline ::proto::VideoMessage_VideoMessageAttribution VideoMessage::_internal_gifattribution() const {
-  return static_cast< ::proto::VideoMessage_VideoMessageAttribution >(gifattribution_);
+  return static_cast< ::proto::VideoMessage_VideoMessageAttribution >(_impl_.gifattribution_);
 }
 inline ::proto::VideoMessage_VideoMessageAttribution VideoMessage::gifattribution() const {
   // @@protoc_insertion_point(field_get:proto.VideoMessage.gifAttribution)
@@ -32255,8 +33581,8 @@ inline ::proto::VideoMessage_VideoMessageAttribution VideoMessage::gifattributio
 }
 inline void VideoMessage::_internal_set_gifattribution(::proto::VideoMessage_VideoMessageAttribution value) {
   assert(::proto::VideoMessage_VideoMessageAttribution_IsValid(value));
-  _has_bits_[0] |= 0x00100000u;
-  gifattribution_ = value;
+  _impl_._has_bits_[0] |= 0x00100000u;
+  _impl_.gifattribution_ = value;
 }
 inline void VideoMessage::set_gifattribution(::proto::VideoMessage_VideoMessageAttribution value) {
   _internal_set_gifattribution(value);
@@ -32265,26 +33591,26 @@ inline void VideoMessage::set_gifattribution(::proto::VideoMessage_VideoMessageA
 
 // optional bool viewOnce = 20;
 inline bool VideoMessage::_internal_has_viewonce() const {
-  bool value = (_has_bits_[0] & 0x00040000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00040000u) != 0;
   return value;
 }
 inline bool VideoMessage::has_viewonce() const {
   return _internal_has_viewonce();
 }
 inline void VideoMessage::clear_viewonce() {
-  viewonce_ = false;
-  _has_bits_[0] &= ~0x00040000u;
+  _impl_.viewonce_ = false;
+  _impl_._has_bits_[0] &= ~0x00040000u;
 }
 inline bool VideoMessage::_internal_viewonce() const {
-  return viewonce_;
+  return _impl_.viewonce_;
 }
 inline bool VideoMessage::viewonce() const {
   // @@protoc_insertion_point(field_get:proto.VideoMessage.viewOnce)
   return _internal_viewonce();
 }
 inline void VideoMessage::_internal_set_viewonce(bool value) {
-  _has_bits_[0] |= 0x00040000u;
-  viewonce_ = value;
+  _impl_._has_bits_[0] |= 0x00040000u;
+  _impl_.viewonce_ = value;
 }
 inline void VideoMessage::set_viewonce(bool value) {
   _internal_set_viewonce(value);
@@ -32293,15 +33619,15 @@ inline void VideoMessage::set_viewonce(bool value) {
 
 // optional string thumbnailDirectPath = 21;
 inline bool VideoMessage::_internal_has_thumbnaildirectpath() const {
-  bool value = (_has_bits_[0] & 0x00000200u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000200u) != 0;
   return value;
 }
 inline bool VideoMessage::has_thumbnaildirectpath() const {
   return _internal_has_thumbnaildirectpath();
 }
 inline void VideoMessage::clear_thumbnaildirectpath() {
-  thumbnaildirectpath_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000200u;
+  _impl_.thumbnaildirectpath_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000200u;
 }
 inline const std::string& VideoMessage::thumbnaildirectpath() const {
   // @@protoc_insertion_point(field_get:proto.VideoMessage.thumbnailDirectPath)
@@ -32310,8 +33636,8 @@ inline const std::string& VideoMessage::thumbnaildirectpath() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void VideoMessage::set_thumbnaildirectpath(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000200u;
- thumbnaildirectpath_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000200u;
+ _impl_.thumbnaildirectpath_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.VideoMessage.thumbnailDirectPath)
 }
 inline std::string* VideoMessage::mutable_thumbnaildirectpath() {
@@ -32320,46 +33646,56 @@ inline std::string* VideoMessage::mutable_thumbnaildirectpath() {
   return _s;
 }
 inline const std::string& VideoMessage::_internal_thumbnaildirectpath() const {
-  return thumbnaildirectpath_.Get();
+  return _impl_.thumbnaildirectpath_.Get();
 }
 inline void VideoMessage::_internal_set_thumbnaildirectpath(const std::string& value) {
-  _has_bits_[0] |= 0x00000200u;
-  thumbnaildirectpath_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000200u;
+  _impl_.thumbnaildirectpath_.Set(value, GetArenaForAllocation());
 }
 inline std::string* VideoMessage::_internal_mutable_thumbnaildirectpath() {
-  _has_bits_[0] |= 0x00000200u;
-  return thumbnaildirectpath_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000200u;
+  return _impl_.thumbnaildirectpath_.Mutable(GetArenaForAllocation());
 }
 inline std::string* VideoMessage::release_thumbnaildirectpath() {
   // @@protoc_insertion_point(field_release:proto.VideoMessage.thumbnailDirectPath)
   if (!_internal_has_thumbnaildirectpath()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000200u;
-  return thumbnaildirectpath_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000200u;
+  auto* p = _impl_.thumbnaildirectpath_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.thumbnaildirectpath_.IsDefault()) {
+    _impl_.thumbnaildirectpath_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void VideoMessage::set_allocated_thumbnaildirectpath(std::string* thumbnaildirectpath) {
   if (thumbnaildirectpath != nullptr) {
-    _has_bits_[0] |= 0x00000200u;
+    _impl_._has_bits_[0] |= 0x00000200u;
   } else {
-    _has_bits_[0] &= ~0x00000200u;
+    _impl_._has_bits_[0] &= ~0x00000200u;
   }
-  thumbnaildirectpath_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), thumbnaildirectpath,
-      GetArenaForAllocation());
+  _impl_.thumbnaildirectpath_.SetAllocated(thumbnaildirectpath, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.thumbnaildirectpath_.IsDefault()) {
+    _impl_.thumbnaildirectpath_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.VideoMessage.thumbnailDirectPath)
 }
 
 // optional bytes thumbnailSha256 = 22;
 inline bool VideoMessage::_internal_has_thumbnailsha256() const {
-  bool value = (_has_bits_[0] & 0x00000400u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000400u) != 0;
   return value;
 }
 inline bool VideoMessage::has_thumbnailsha256() const {
   return _internal_has_thumbnailsha256();
 }
 inline void VideoMessage::clear_thumbnailsha256() {
-  thumbnailsha256_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000400u;
+  _impl_.thumbnailsha256_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000400u;
 }
 inline const std::string& VideoMessage::thumbnailsha256() const {
   // @@protoc_insertion_point(field_get:proto.VideoMessage.thumbnailSha256)
@@ -32368,8 +33704,8 @@ inline const std::string& VideoMessage::thumbnailsha256() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void VideoMessage::set_thumbnailsha256(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000400u;
- thumbnailsha256_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000400u;
+ _impl_.thumbnailsha256_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.VideoMessage.thumbnailSha256)
 }
 inline std::string* VideoMessage::mutable_thumbnailsha256() {
@@ -32378,46 +33714,56 @@ inline std::string* VideoMessage::mutable_thumbnailsha256() {
   return _s;
 }
 inline const std::string& VideoMessage::_internal_thumbnailsha256() const {
-  return thumbnailsha256_.Get();
+  return _impl_.thumbnailsha256_.Get();
 }
 inline void VideoMessage::_internal_set_thumbnailsha256(const std::string& value) {
-  _has_bits_[0] |= 0x00000400u;
-  thumbnailsha256_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000400u;
+  _impl_.thumbnailsha256_.Set(value, GetArenaForAllocation());
 }
 inline std::string* VideoMessage::_internal_mutable_thumbnailsha256() {
-  _has_bits_[0] |= 0x00000400u;
-  return thumbnailsha256_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000400u;
+  return _impl_.thumbnailsha256_.Mutable(GetArenaForAllocation());
 }
 inline std::string* VideoMessage::release_thumbnailsha256() {
   // @@protoc_insertion_point(field_release:proto.VideoMessage.thumbnailSha256)
   if (!_internal_has_thumbnailsha256()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000400u;
-  return thumbnailsha256_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000400u;
+  auto* p = _impl_.thumbnailsha256_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.thumbnailsha256_.IsDefault()) {
+    _impl_.thumbnailsha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void VideoMessage::set_allocated_thumbnailsha256(std::string* thumbnailsha256) {
   if (thumbnailsha256 != nullptr) {
-    _has_bits_[0] |= 0x00000400u;
+    _impl_._has_bits_[0] |= 0x00000400u;
   } else {
-    _has_bits_[0] &= ~0x00000400u;
+    _impl_._has_bits_[0] &= ~0x00000400u;
   }
-  thumbnailsha256_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), thumbnailsha256,
-      GetArenaForAllocation());
+  _impl_.thumbnailsha256_.SetAllocated(thumbnailsha256, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.thumbnailsha256_.IsDefault()) {
+    _impl_.thumbnailsha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.VideoMessage.thumbnailSha256)
 }
 
 // optional bytes thumbnailEncSha256 = 23;
 inline bool VideoMessage::_internal_has_thumbnailencsha256() const {
-  bool value = (_has_bits_[0] & 0x00000800u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000800u) != 0;
   return value;
 }
 inline bool VideoMessage::has_thumbnailencsha256() const {
   return _internal_has_thumbnailencsha256();
 }
 inline void VideoMessage::clear_thumbnailencsha256() {
-  thumbnailencsha256_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000800u;
+  _impl_.thumbnailencsha256_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000800u;
 }
 inline const std::string& VideoMessage::thumbnailencsha256() const {
   // @@protoc_insertion_point(field_get:proto.VideoMessage.thumbnailEncSha256)
@@ -32426,8 +33772,8 @@ inline const std::string& VideoMessage::thumbnailencsha256() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void VideoMessage::set_thumbnailencsha256(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000800u;
- thumbnailencsha256_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000800u;
+ _impl_.thumbnailencsha256_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.VideoMessage.thumbnailEncSha256)
 }
 inline std::string* VideoMessage::mutable_thumbnailencsha256() {
@@ -32436,32 +33782,42 @@ inline std::string* VideoMessage::mutable_thumbnailencsha256() {
   return _s;
 }
 inline const std::string& VideoMessage::_internal_thumbnailencsha256() const {
-  return thumbnailencsha256_.Get();
+  return _impl_.thumbnailencsha256_.Get();
 }
 inline void VideoMessage::_internal_set_thumbnailencsha256(const std::string& value) {
-  _has_bits_[0] |= 0x00000800u;
-  thumbnailencsha256_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000800u;
+  _impl_.thumbnailencsha256_.Set(value, GetArenaForAllocation());
 }
 inline std::string* VideoMessage::_internal_mutable_thumbnailencsha256() {
-  _has_bits_[0] |= 0x00000800u;
-  return thumbnailencsha256_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000800u;
+  return _impl_.thumbnailencsha256_.Mutable(GetArenaForAllocation());
 }
 inline std::string* VideoMessage::release_thumbnailencsha256() {
   // @@protoc_insertion_point(field_release:proto.VideoMessage.thumbnailEncSha256)
   if (!_internal_has_thumbnailencsha256()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000800u;
-  return thumbnailencsha256_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000800u;
+  auto* p = _impl_.thumbnailencsha256_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.thumbnailencsha256_.IsDefault()) {
+    _impl_.thumbnailencsha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void VideoMessage::set_allocated_thumbnailencsha256(std::string* thumbnailencsha256) {
   if (thumbnailencsha256 != nullptr) {
-    _has_bits_[0] |= 0x00000800u;
+    _impl_._has_bits_[0] |= 0x00000800u;
   } else {
-    _has_bits_[0] &= ~0x00000800u;
+    _impl_._has_bits_[0] &= ~0x00000800u;
+  }
+  _impl_.thumbnailencsha256_.SetAllocated(thumbnailencsha256, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.thumbnailencsha256_.IsDefault()) {
+    _impl_.thumbnailencsha256_.Set("", GetArenaForAllocation());
   }
-  thumbnailencsha256_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), thumbnailencsha256,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.VideoMessage.thumbnailEncSha256)
 }
 
@@ -32471,15 +33827,15 @@ inline void VideoMessage::set_allocated_thumbnailencsha256(std::string* thumbnai
 
 // optional bytes callKey = 1;
 inline bool Call::_internal_has_callkey() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool Call::has_callkey() const {
   return _internal_has_callkey();
 }
 inline void Call::clear_callkey() {
-  callkey_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.callkey_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& Call::callkey() const {
   // @@protoc_insertion_point(field_get:proto.Call.callKey)
@@ -32488,8 +33844,8 @@ inline const std::string& Call::callkey() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void Call::set_callkey(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- callkey_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.callkey_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.Call.callKey)
 }
 inline std::string* Call::mutable_callkey() {
@@ -32498,32 +33854,42 @@ inline std::string* Call::mutable_callkey() {
   return _s;
 }
 inline const std::string& Call::_internal_callkey() const {
-  return callkey_.Get();
+  return _impl_.callkey_.Get();
 }
 inline void Call::_internal_set_callkey(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  callkey_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.callkey_.Set(value, GetArenaForAllocation());
 }
 inline std::string* Call::_internal_mutable_callkey() {
-  _has_bits_[0] |= 0x00000001u;
-  return callkey_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.callkey_.Mutable(GetArenaForAllocation());
 }
 inline std::string* Call::release_callkey() {
   // @@protoc_insertion_point(field_release:proto.Call.callKey)
   if (!_internal_has_callkey()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return callkey_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.callkey_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.callkey_.IsDefault()) {
+    _impl_.callkey_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void Call::set_allocated_callkey(std::string* callkey) {
   if (callkey != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
+  }
+  _impl_.callkey_.SetAllocated(callkey, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.callkey_.IsDefault()) {
+    _impl_.callkey_.Set("", GetArenaForAllocation());
   }
-  callkey_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), callkey,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.Call.callKey)
 }
 
@@ -32533,15 +33899,15 @@ inline void Call::set_allocated_callkey(std::string* callkey) {
 
 // optional string displayName = 1;
 inline bool Chat::_internal_has_displayname() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool Chat::has_displayname() const {
   return _internal_has_displayname();
 }
 inline void Chat::clear_displayname() {
-  displayname_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.displayname_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& Chat::displayname() const {
   // @@protoc_insertion_point(field_get:proto.Chat.displayName)
@@ -32550,8 +33916,8 @@ inline const std::string& Chat::displayname() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void Chat::set_displayname(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- displayname_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.displayname_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.Chat.displayName)
 }
 inline std::string* Chat::mutable_displayname() {
@@ -32560,46 +33926,56 @@ inline std::string* Chat::mutable_displayname() {
   return _s;
 }
 inline const std::string& Chat::_internal_displayname() const {
-  return displayname_.Get();
+  return _impl_.displayname_.Get();
 }
 inline void Chat::_internal_set_displayname(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  displayname_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.displayname_.Set(value, GetArenaForAllocation());
 }
 inline std::string* Chat::_internal_mutable_displayname() {
-  _has_bits_[0] |= 0x00000001u;
-  return displayname_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.displayname_.Mutable(GetArenaForAllocation());
 }
 inline std::string* Chat::release_displayname() {
   // @@protoc_insertion_point(field_release:proto.Chat.displayName)
   if (!_internal_has_displayname()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return displayname_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.displayname_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.displayname_.IsDefault()) {
+    _impl_.displayname_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void Chat::set_allocated_displayname(std::string* displayname) {
   if (displayname != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
+  }
+  _impl_.displayname_.SetAllocated(displayname, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.displayname_.IsDefault()) {
+    _impl_.displayname_.Set("", GetArenaForAllocation());
   }
-  displayname_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), displayname,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.Chat.displayName)
 }
 
 // optional string id = 2;
 inline bool Chat::_internal_has_id() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool Chat::has_id() const {
   return _internal_has_id();
 }
 inline void Chat::clear_id() {
-  id_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.id_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& Chat::id() const {
   // @@protoc_insertion_point(field_get:proto.Chat.id)
@@ -32608,8 +33984,8 @@ inline const std::string& Chat::id() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void Chat::set_id(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- id_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.id_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.Chat.id)
 }
 inline std::string* Chat::mutable_id() {
@@ -32618,32 +33994,42 @@ inline std::string* Chat::mutable_id() {
   return _s;
 }
 inline const std::string& Chat::_internal_id() const {
-  return id_.Get();
+  return _impl_.id_.Get();
 }
 inline void Chat::_internal_set_id(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  id_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.id_.Set(value, GetArenaForAllocation());
 }
 inline std::string* Chat::_internal_mutable_id() {
-  _has_bits_[0] |= 0x00000002u;
-  return id_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.id_.Mutable(GetArenaForAllocation());
 }
 inline std::string* Chat::release_id() {
   // @@protoc_insertion_point(field_release:proto.Chat.id)
   if (!_internal_has_id()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return id_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.id_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.id_.IsDefault()) {
+    _impl_.id_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void Chat::set_allocated_id(std::string* id) {
   if (id != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
+  }
+  _impl_.id_.SetAllocated(id, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.id_.IsDefault()) {
+    _impl_.id_.Set("", GetArenaForAllocation());
   }
-  id_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), id,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.Chat.id)
 }
 
@@ -32653,19 +34039,19 @@ inline void Chat::set_allocated_id(std::string* id) {
 
 // optional .proto.MessageKey key = 1;
 inline bool ProtocolMessage::_internal_has_key() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || key_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.key_ != nullptr);
   return value;
 }
 inline bool ProtocolMessage::has_key() const {
   return _internal_has_key();
 }
 inline void ProtocolMessage::clear_key() {
-  if (key_ != nullptr) key_->Clear();
-  _has_bits_[0] &= ~0x00000001u;
+  if (_impl_.key_ != nullptr) _impl_.key_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const ::proto::MessageKey& ProtocolMessage::_internal_key() const {
-  const ::proto::MessageKey* p = key_;
+  const ::proto::MessageKey* p = _impl_.key_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::MessageKey&>(
       ::proto::_MessageKey_default_instance_);
 }
@@ -32676,20 +34062,20 @@ inline const ::proto::MessageKey& ProtocolMessage::key() const {
 inline void ProtocolMessage::unsafe_arena_set_allocated_key(
     ::proto::MessageKey* key) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(key_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.key_);
   }
-  key_ = key;
+  _impl_.key_ = key;
   if (key) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.ProtocolMessage.key)
 }
 inline ::proto::MessageKey* ProtocolMessage::release_key() {
-  _has_bits_[0] &= ~0x00000001u;
-  ::proto::MessageKey* temp = key_;
-  key_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  ::proto::MessageKey* temp = _impl_.key_;
+  _impl_.key_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -32703,18 +34089,18 @@ inline ::proto::MessageKey* ProtocolMessage::release_key() {
 }
 inline ::proto::MessageKey* ProtocolMessage::unsafe_arena_release_key() {
   // @@protoc_insertion_point(field_release:proto.ProtocolMessage.key)
-  _has_bits_[0] &= ~0x00000001u;
-  ::proto::MessageKey* temp = key_;
-  key_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  ::proto::MessageKey* temp = _impl_.key_;
+  _impl_.key_ = nullptr;
   return temp;
 }
 inline ::proto::MessageKey* ProtocolMessage::_internal_mutable_key() {
-  _has_bits_[0] |= 0x00000001u;
-  if (key_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000001u;
+  if (_impl_.key_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::MessageKey>(GetArenaForAllocation());
-    key_ = p;
+    _impl_.key_ = p;
   }
-  return key_;
+  return _impl_.key_;
 }
 inline ::proto::MessageKey* ProtocolMessage::mutable_key() {
   ::proto::MessageKey* _msg = _internal_mutable_key();
@@ -32724,37 +34110,37 @@ inline ::proto::MessageKey* ProtocolMessage::mutable_key() {
 inline void ProtocolMessage::set_allocated_key(::proto::MessageKey* key) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete key_;
+    delete _impl_.key_;
   }
   if (key) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::MessageKey>::GetOwningArena(key);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(key);
     if (message_arena != submessage_arena) {
       key = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, key, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  key_ = key;
+  _impl_.key_ = key;
   // @@protoc_insertion_point(field_set_allocated:proto.ProtocolMessage.key)
 }
 
 // optional .proto.ProtocolMessage.ProtocolMessageType type = 2;
 inline bool ProtocolMessage::_internal_has_type() const {
-  bool value = (_has_bits_[0] & 0x00000040u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
   return value;
 }
 inline bool ProtocolMessage::has_type() const {
   return _internal_has_type();
 }
 inline void ProtocolMessage::clear_type() {
-  type_ = 0;
-  _has_bits_[0] &= ~0x00000040u;
+  _impl_.type_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000040u;
 }
 inline ::proto::ProtocolMessage_ProtocolMessageType ProtocolMessage::_internal_type() const {
-  return static_cast< ::proto::ProtocolMessage_ProtocolMessageType >(type_);
+  return static_cast< ::proto::ProtocolMessage_ProtocolMessageType >(_impl_.type_);
 }
 inline ::proto::ProtocolMessage_ProtocolMessageType ProtocolMessage::type() const {
   // @@protoc_insertion_point(field_get:proto.ProtocolMessage.type)
@@ -32762,8 +34148,8 @@ inline ::proto::ProtocolMessage_ProtocolMessageType ProtocolMessage::type() cons
 }
 inline void ProtocolMessage::_internal_set_type(::proto::ProtocolMessage_ProtocolMessageType value) {
   assert(::proto::ProtocolMessage_ProtocolMessageType_IsValid(value));
-  _has_bits_[0] |= 0x00000040u;
-  type_ = value;
+  _impl_._has_bits_[0] |= 0x00000040u;
+  _impl_.type_ = value;
 }
 inline void ProtocolMessage::set_type(::proto::ProtocolMessage_ProtocolMessageType value) {
   _internal_set_type(value);
@@ -32772,75 +34158,75 @@ inline void ProtocolMessage::set_type(::proto::ProtocolMessage_ProtocolMessageTy
 
 // optional uint32 ephemeralExpiration = 4;
 inline bool ProtocolMessage::_internal_has_ephemeralexpiration() const {
-  bool value = (_has_bits_[0] & 0x00000080u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000080u) != 0;
   return value;
 }
 inline bool ProtocolMessage::has_ephemeralexpiration() const {
   return _internal_has_ephemeralexpiration();
 }
 inline void ProtocolMessage::clear_ephemeralexpiration() {
-  ephemeralexpiration_ = 0u;
-  _has_bits_[0] &= ~0x00000080u;
+  _impl_.ephemeralexpiration_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000080u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 ProtocolMessage::_internal_ephemeralexpiration() const {
-  return ephemeralexpiration_;
+inline uint32_t ProtocolMessage::_internal_ephemeralexpiration() const {
+  return _impl_.ephemeralexpiration_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 ProtocolMessage::ephemeralexpiration() const {
+inline uint32_t ProtocolMessage::ephemeralexpiration() const {
   // @@protoc_insertion_point(field_get:proto.ProtocolMessage.ephemeralExpiration)
   return _internal_ephemeralexpiration();
 }
-inline void ProtocolMessage::_internal_set_ephemeralexpiration(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000080u;
-  ephemeralexpiration_ = value;
+inline void ProtocolMessage::_internal_set_ephemeralexpiration(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000080u;
+  _impl_.ephemeralexpiration_ = value;
 }
-inline void ProtocolMessage::set_ephemeralexpiration(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void ProtocolMessage::set_ephemeralexpiration(uint32_t value) {
   _internal_set_ephemeralexpiration(value);
   // @@protoc_insertion_point(field_set:proto.ProtocolMessage.ephemeralExpiration)
 }
 
 // optional int64 ephemeralSettingTimestamp = 5;
 inline bool ProtocolMessage::_internal_has_ephemeralsettingtimestamp() const {
-  bool value = (_has_bits_[0] & 0x00000100u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000100u) != 0;
   return value;
 }
 inline bool ProtocolMessage::has_ephemeralsettingtimestamp() const {
   return _internal_has_ephemeralsettingtimestamp();
 }
 inline void ProtocolMessage::clear_ephemeralsettingtimestamp() {
-  ephemeralsettingtimestamp_ = int64_t{0};
-  _has_bits_[0] &= ~0x00000100u;
+  _impl_.ephemeralsettingtimestamp_ = int64_t{0};
+  _impl_._has_bits_[0] &= ~0x00000100u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 ProtocolMessage::_internal_ephemeralsettingtimestamp() const {
-  return ephemeralsettingtimestamp_;
+inline int64_t ProtocolMessage::_internal_ephemeralsettingtimestamp() const {
+  return _impl_.ephemeralsettingtimestamp_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 ProtocolMessage::ephemeralsettingtimestamp() const {
+inline int64_t ProtocolMessage::ephemeralsettingtimestamp() const {
   // @@protoc_insertion_point(field_get:proto.ProtocolMessage.ephemeralSettingTimestamp)
   return _internal_ephemeralsettingtimestamp();
 }
-inline void ProtocolMessage::_internal_set_ephemeralsettingtimestamp(::PROTOBUF_NAMESPACE_ID::int64 value) {
-  _has_bits_[0] |= 0x00000100u;
-  ephemeralsettingtimestamp_ = value;
+inline void ProtocolMessage::_internal_set_ephemeralsettingtimestamp(int64_t value) {
+  _impl_._has_bits_[0] |= 0x00000100u;
+  _impl_.ephemeralsettingtimestamp_ = value;
 }
-inline void ProtocolMessage::set_ephemeralsettingtimestamp(::PROTOBUF_NAMESPACE_ID::int64 value) {
+inline void ProtocolMessage::set_ephemeralsettingtimestamp(int64_t value) {
   _internal_set_ephemeralsettingtimestamp(value);
   // @@protoc_insertion_point(field_set:proto.ProtocolMessage.ephemeralSettingTimestamp)
 }
 
 // optional .proto.HistorySyncNotification historySyncNotification = 6;
 inline bool ProtocolMessage::_internal_has_historysyncnotification() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || historysyncnotification_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.historysyncnotification_ != nullptr);
   return value;
 }
 inline bool ProtocolMessage::has_historysyncnotification() const {
   return _internal_has_historysyncnotification();
 }
 inline void ProtocolMessage::clear_historysyncnotification() {
-  if (historysyncnotification_ != nullptr) historysyncnotification_->Clear();
-  _has_bits_[0] &= ~0x00000002u;
+  if (_impl_.historysyncnotification_ != nullptr) _impl_.historysyncnotification_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const ::proto::HistorySyncNotification& ProtocolMessage::_internal_historysyncnotification() const {
-  const ::proto::HistorySyncNotification* p = historysyncnotification_;
+  const ::proto::HistorySyncNotification* p = _impl_.historysyncnotification_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::HistorySyncNotification&>(
       ::proto::_HistorySyncNotification_default_instance_);
 }
@@ -32851,20 +34237,20 @@ inline const ::proto::HistorySyncNotification& ProtocolMessage::historysyncnotif
 inline void ProtocolMessage::unsafe_arena_set_allocated_historysyncnotification(
     ::proto::HistorySyncNotification* historysyncnotification) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(historysyncnotification_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.historysyncnotification_);
   }
-  historysyncnotification_ = historysyncnotification;
+  _impl_.historysyncnotification_ = historysyncnotification;
   if (historysyncnotification) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.ProtocolMessage.historySyncNotification)
 }
 inline ::proto::HistorySyncNotification* ProtocolMessage::release_historysyncnotification() {
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::HistorySyncNotification* temp = historysyncnotification_;
-  historysyncnotification_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::HistorySyncNotification* temp = _impl_.historysyncnotification_;
+  _impl_.historysyncnotification_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -32878,18 +34264,18 @@ inline ::proto::HistorySyncNotification* ProtocolMessage::release_historysyncnot
 }
 inline ::proto::HistorySyncNotification* ProtocolMessage::unsafe_arena_release_historysyncnotification() {
   // @@protoc_insertion_point(field_release:proto.ProtocolMessage.historySyncNotification)
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::HistorySyncNotification* temp = historysyncnotification_;
-  historysyncnotification_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::HistorySyncNotification* temp = _impl_.historysyncnotification_;
+  _impl_.historysyncnotification_ = nullptr;
   return temp;
 }
 inline ::proto::HistorySyncNotification* ProtocolMessage::_internal_mutable_historysyncnotification() {
-  _has_bits_[0] |= 0x00000002u;
-  if (historysyncnotification_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000002u;
+  if (_impl_.historysyncnotification_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::HistorySyncNotification>(GetArenaForAllocation());
-    historysyncnotification_ = p;
+    _impl_.historysyncnotification_ = p;
   }
-  return historysyncnotification_;
+  return _impl_.historysyncnotification_;
 }
 inline ::proto::HistorySyncNotification* ProtocolMessage::mutable_historysyncnotification() {
   ::proto::HistorySyncNotification* _msg = _internal_mutable_historysyncnotification();
@@ -32899,38 +34285,38 @@ inline ::proto::HistorySyncNotification* ProtocolMessage::mutable_historysyncnot
 inline void ProtocolMessage::set_allocated_historysyncnotification(::proto::HistorySyncNotification* historysyncnotification) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete historysyncnotification_;
+    delete _impl_.historysyncnotification_;
   }
   if (historysyncnotification) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::HistorySyncNotification>::GetOwningArena(historysyncnotification);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(historysyncnotification);
     if (message_arena != submessage_arena) {
       historysyncnotification = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, historysyncnotification, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  historysyncnotification_ = historysyncnotification;
+  _impl_.historysyncnotification_ = historysyncnotification;
   // @@protoc_insertion_point(field_set_allocated:proto.ProtocolMessage.historySyncNotification)
 }
 
 // optional .proto.AppStateSyncKeyShare appStateSyncKeyShare = 7;
 inline bool ProtocolMessage::_internal_has_appstatesynckeyshare() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || appstatesynckeyshare_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.appstatesynckeyshare_ != nullptr);
   return value;
 }
 inline bool ProtocolMessage::has_appstatesynckeyshare() const {
   return _internal_has_appstatesynckeyshare();
 }
 inline void ProtocolMessage::clear_appstatesynckeyshare() {
-  if (appstatesynckeyshare_ != nullptr) appstatesynckeyshare_->Clear();
-  _has_bits_[0] &= ~0x00000004u;
+  if (_impl_.appstatesynckeyshare_ != nullptr) _impl_.appstatesynckeyshare_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const ::proto::AppStateSyncKeyShare& ProtocolMessage::_internal_appstatesynckeyshare() const {
-  const ::proto::AppStateSyncKeyShare* p = appstatesynckeyshare_;
+  const ::proto::AppStateSyncKeyShare* p = _impl_.appstatesynckeyshare_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::AppStateSyncKeyShare&>(
       ::proto::_AppStateSyncKeyShare_default_instance_);
 }
@@ -32941,20 +34327,20 @@ inline const ::proto::AppStateSyncKeyShare& ProtocolMessage::appstatesynckeyshar
 inline void ProtocolMessage::unsafe_arena_set_allocated_appstatesynckeyshare(
     ::proto::AppStateSyncKeyShare* appstatesynckeyshare) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(appstatesynckeyshare_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.appstatesynckeyshare_);
   }
-  appstatesynckeyshare_ = appstatesynckeyshare;
+  _impl_.appstatesynckeyshare_ = appstatesynckeyshare;
   if (appstatesynckeyshare) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.ProtocolMessage.appStateSyncKeyShare)
 }
 inline ::proto::AppStateSyncKeyShare* ProtocolMessage::release_appstatesynckeyshare() {
-  _has_bits_[0] &= ~0x00000004u;
-  ::proto::AppStateSyncKeyShare* temp = appstatesynckeyshare_;
-  appstatesynckeyshare_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::proto::AppStateSyncKeyShare* temp = _impl_.appstatesynckeyshare_;
+  _impl_.appstatesynckeyshare_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -32968,18 +34354,18 @@ inline ::proto::AppStateSyncKeyShare* ProtocolMessage::release_appstatesynckeysh
 }
 inline ::proto::AppStateSyncKeyShare* ProtocolMessage::unsafe_arena_release_appstatesynckeyshare() {
   // @@protoc_insertion_point(field_release:proto.ProtocolMessage.appStateSyncKeyShare)
-  _has_bits_[0] &= ~0x00000004u;
-  ::proto::AppStateSyncKeyShare* temp = appstatesynckeyshare_;
-  appstatesynckeyshare_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::proto::AppStateSyncKeyShare* temp = _impl_.appstatesynckeyshare_;
+  _impl_.appstatesynckeyshare_ = nullptr;
   return temp;
 }
 inline ::proto::AppStateSyncKeyShare* ProtocolMessage::_internal_mutable_appstatesynckeyshare() {
-  _has_bits_[0] |= 0x00000004u;
-  if (appstatesynckeyshare_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000004u;
+  if (_impl_.appstatesynckeyshare_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::AppStateSyncKeyShare>(GetArenaForAllocation());
-    appstatesynckeyshare_ = p;
+    _impl_.appstatesynckeyshare_ = p;
   }
-  return appstatesynckeyshare_;
+  return _impl_.appstatesynckeyshare_;
 }
 inline ::proto::AppStateSyncKeyShare* ProtocolMessage::mutable_appstatesynckeyshare() {
   ::proto::AppStateSyncKeyShare* _msg = _internal_mutable_appstatesynckeyshare();
@@ -32989,38 +34375,38 @@ inline ::proto::AppStateSyncKeyShare* ProtocolMessage::mutable_appstatesynckeysh
 inline void ProtocolMessage::set_allocated_appstatesynckeyshare(::proto::AppStateSyncKeyShare* appstatesynckeyshare) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete appstatesynckeyshare_;
+    delete _impl_.appstatesynckeyshare_;
   }
   if (appstatesynckeyshare) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::AppStateSyncKeyShare>::GetOwningArena(appstatesynckeyshare);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(appstatesynckeyshare);
     if (message_arena != submessage_arena) {
       appstatesynckeyshare = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, appstatesynckeyshare, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
-  appstatesynckeyshare_ = appstatesynckeyshare;
+  _impl_.appstatesynckeyshare_ = appstatesynckeyshare;
   // @@protoc_insertion_point(field_set_allocated:proto.ProtocolMessage.appStateSyncKeyShare)
 }
 
 // optional .proto.AppStateSyncKeyRequest appStateSyncKeyRequest = 8;
 inline bool ProtocolMessage::_internal_has_appstatesynckeyrequest() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
-  PROTOBUF_ASSUME(!value || appstatesynckeyrequest_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.appstatesynckeyrequest_ != nullptr);
   return value;
 }
 inline bool ProtocolMessage::has_appstatesynckeyrequest() const {
   return _internal_has_appstatesynckeyrequest();
 }
 inline void ProtocolMessage::clear_appstatesynckeyrequest() {
-  if (appstatesynckeyrequest_ != nullptr) appstatesynckeyrequest_->Clear();
-  _has_bits_[0] &= ~0x00000008u;
+  if (_impl_.appstatesynckeyrequest_ != nullptr) _impl_.appstatesynckeyrequest_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline const ::proto::AppStateSyncKeyRequest& ProtocolMessage::_internal_appstatesynckeyrequest() const {
-  const ::proto::AppStateSyncKeyRequest* p = appstatesynckeyrequest_;
+  const ::proto::AppStateSyncKeyRequest* p = _impl_.appstatesynckeyrequest_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::AppStateSyncKeyRequest&>(
       ::proto::_AppStateSyncKeyRequest_default_instance_);
 }
@@ -33031,20 +34417,20 @@ inline const ::proto::AppStateSyncKeyRequest& ProtocolMessage::appstatesynckeyre
 inline void ProtocolMessage::unsafe_arena_set_allocated_appstatesynckeyrequest(
     ::proto::AppStateSyncKeyRequest* appstatesynckeyrequest) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(appstatesynckeyrequest_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.appstatesynckeyrequest_);
   }
-  appstatesynckeyrequest_ = appstatesynckeyrequest;
+  _impl_.appstatesynckeyrequest_ = appstatesynckeyrequest;
   if (appstatesynckeyrequest) {
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.ProtocolMessage.appStateSyncKeyRequest)
 }
 inline ::proto::AppStateSyncKeyRequest* ProtocolMessage::release_appstatesynckeyrequest() {
-  _has_bits_[0] &= ~0x00000008u;
-  ::proto::AppStateSyncKeyRequest* temp = appstatesynckeyrequest_;
-  appstatesynckeyrequest_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  ::proto::AppStateSyncKeyRequest* temp = _impl_.appstatesynckeyrequest_;
+  _impl_.appstatesynckeyrequest_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -33058,18 +34444,18 @@ inline ::proto::AppStateSyncKeyRequest* ProtocolMessage::release_appstatesynckey
 }
 inline ::proto::AppStateSyncKeyRequest* ProtocolMessage::unsafe_arena_release_appstatesynckeyrequest() {
   // @@protoc_insertion_point(field_release:proto.ProtocolMessage.appStateSyncKeyRequest)
-  _has_bits_[0] &= ~0x00000008u;
-  ::proto::AppStateSyncKeyRequest* temp = appstatesynckeyrequest_;
-  appstatesynckeyrequest_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  ::proto::AppStateSyncKeyRequest* temp = _impl_.appstatesynckeyrequest_;
+  _impl_.appstatesynckeyrequest_ = nullptr;
   return temp;
 }
 inline ::proto::AppStateSyncKeyRequest* ProtocolMessage::_internal_mutable_appstatesynckeyrequest() {
-  _has_bits_[0] |= 0x00000008u;
-  if (appstatesynckeyrequest_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000008u;
+  if (_impl_.appstatesynckeyrequest_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::AppStateSyncKeyRequest>(GetArenaForAllocation());
-    appstatesynckeyrequest_ = p;
+    _impl_.appstatesynckeyrequest_ = p;
   }
-  return appstatesynckeyrequest_;
+  return _impl_.appstatesynckeyrequest_;
 }
 inline ::proto::AppStateSyncKeyRequest* ProtocolMessage::mutable_appstatesynckeyrequest() {
   ::proto::AppStateSyncKeyRequest* _msg = _internal_mutable_appstatesynckeyrequest();
@@ -33079,38 +34465,38 @@ inline ::proto::AppStateSyncKeyRequest* ProtocolMessage::mutable_appstatesynckey
 inline void ProtocolMessage::set_allocated_appstatesynckeyrequest(::proto::AppStateSyncKeyRequest* appstatesynckeyrequest) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete appstatesynckeyrequest_;
+    delete _impl_.appstatesynckeyrequest_;
   }
   if (appstatesynckeyrequest) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::AppStateSyncKeyRequest>::GetOwningArena(appstatesynckeyrequest);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(appstatesynckeyrequest);
     if (message_arena != submessage_arena) {
       appstatesynckeyrequest = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, appstatesynckeyrequest, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
   }
-  appstatesynckeyrequest_ = appstatesynckeyrequest;
+  _impl_.appstatesynckeyrequest_ = appstatesynckeyrequest;
   // @@protoc_insertion_point(field_set_allocated:proto.ProtocolMessage.appStateSyncKeyRequest)
 }
 
 // optional .proto.InitialSecurityNotificationSettingSync initialSecurityNotificationSettingSync = 9;
 inline bool ProtocolMessage::_internal_has_initialsecuritynotificationsettingsync() const {
-  bool value = (_has_bits_[0] & 0x00000010u) != 0;
-  PROTOBUF_ASSUME(!value || initialsecuritynotificationsettingsync_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.initialsecuritynotificationsettingsync_ != nullptr);
   return value;
 }
 inline bool ProtocolMessage::has_initialsecuritynotificationsettingsync() const {
   return _internal_has_initialsecuritynotificationsettingsync();
 }
 inline void ProtocolMessage::clear_initialsecuritynotificationsettingsync() {
-  if (initialsecuritynotificationsettingsync_ != nullptr) initialsecuritynotificationsettingsync_->Clear();
-  _has_bits_[0] &= ~0x00000010u;
+  if (_impl_.initialsecuritynotificationsettingsync_ != nullptr) _impl_.initialsecuritynotificationsettingsync_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000010u;
 }
 inline const ::proto::InitialSecurityNotificationSettingSync& ProtocolMessage::_internal_initialsecuritynotificationsettingsync() const {
-  const ::proto::InitialSecurityNotificationSettingSync* p = initialsecuritynotificationsettingsync_;
+  const ::proto::InitialSecurityNotificationSettingSync* p = _impl_.initialsecuritynotificationsettingsync_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::InitialSecurityNotificationSettingSync&>(
       ::proto::_InitialSecurityNotificationSettingSync_default_instance_);
 }
@@ -33121,20 +34507,20 @@ inline const ::proto::InitialSecurityNotificationSettingSync& ProtocolMessage::i
 inline void ProtocolMessage::unsafe_arena_set_allocated_initialsecuritynotificationsettingsync(
     ::proto::InitialSecurityNotificationSettingSync* initialsecuritynotificationsettingsync) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(initialsecuritynotificationsettingsync_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.initialsecuritynotificationsettingsync_);
   }
-  initialsecuritynotificationsettingsync_ = initialsecuritynotificationsettingsync;
+  _impl_.initialsecuritynotificationsettingsync_ = initialsecuritynotificationsettingsync;
   if (initialsecuritynotificationsettingsync) {
-    _has_bits_[0] |= 0x00000010u;
+    _impl_._has_bits_[0] |= 0x00000010u;
   } else {
-    _has_bits_[0] &= ~0x00000010u;
+    _impl_._has_bits_[0] &= ~0x00000010u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.ProtocolMessage.initialSecurityNotificationSettingSync)
 }
 inline ::proto::InitialSecurityNotificationSettingSync* ProtocolMessage::release_initialsecuritynotificationsettingsync() {
-  _has_bits_[0] &= ~0x00000010u;
-  ::proto::InitialSecurityNotificationSettingSync* temp = initialsecuritynotificationsettingsync_;
-  initialsecuritynotificationsettingsync_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000010u;
+  ::proto::InitialSecurityNotificationSettingSync* temp = _impl_.initialsecuritynotificationsettingsync_;
+  _impl_.initialsecuritynotificationsettingsync_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -33148,18 +34534,18 @@ inline ::proto::InitialSecurityNotificationSettingSync* ProtocolMessage::release
 }
 inline ::proto::InitialSecurityNotificationSettingSync* ProtocolMessage::unsafe_arena_release_initialsecuritynotificationsettingsync() {
   // @@protoc_insertion_point(field_release:proto.ProtocolMessage.initialSecurityNotificationSettingSync)
-  _has_bits_[0] &= ~0x00000010u;
-  ::proto::InitialSecurityNotificationSettingSync* temp = initialsecuritynotificationsettingsync_;
-  initialsecuritynotificationsettingsync_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000010u;
+  ::proto::InitialSecurityNotificationSettingSync* temp = _impl_.initialsecuritynotificationsettingsync_;
+  _impl_.initialsecuritynotificationsettingsync_ = nullptr;
   return temp;
 }
 inline ::proto::InitialSecurityNotificationSettingSync* ProtocolMessage::_internal_mutable_initialsecuritynotificationsettingsync() {
-  _has_bits_[0] |= 0x00000010u;
-  if (initialsecuritynotificationsettingsync_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000010u;
+  if (_impl_.initialsecuritynotificationsettingsync_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::InitialSecurityNotificationSettingSync>(GetArenaForAllocation());
-    initialsecuritynotificationsettingsync_ = p;
+    _impl_.initialsecuritynotificationsettingsync_ = p;
   }
-  return initialsecuritynotificationsettingsync_;
+  return _impl_.initialsecuritynotificationsettingsync_;
 }
 inline ::proto::InitialSecurityNotificationSettingSync* ProtocolMessage::mutable_initialsecuritynotificationsettingsync() {
   ::proto::InitialSecurityNotificationSettingSync* _msg = _internal_mutable_initialsecuritynotificationsettingsync();
@@ -33169,38 +34555,38 @@ inline ::proto::InitialSecurityNotificationSettingSync* ProtocolMessage::mutable
 inline void ProtocolMessage::set_allocated_initialsecuritynotificationsettingsync(::proto::InitialSecurityNotificationSettingSync* initialsecuritynotificationsettingsync) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete initialsecuritynotificationsettingsync_;
+    delete _impl_.initialsecuritynotificationsettingsync_;
   }
   if (initialsecuritynotificationsettingsync) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::InitialSecurityNotificationSettingSync>::GetOwningArena(initialsecuritynotificationsettingsync);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(initialsecuritynotificationsettingsync);
     if (message_arena != submessage_arena) {
       initialsecuritynotificationsettingsync = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, initialsecuritynotificationsettingsync, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000010u;
+    _impl_._has_bits_[0] |= 0x00000010u;
   } else {
-    _has_bits_[0] &= ~0x00000010u;
+    _impl_._has_bits_[0] &= ~0x00000010u;
   }
-  initialsecuritynotificationsettingsync_ = initialsecuritynotificationsettingsync;
+  _impl_.initialsecuritynotificationsettingsync_ = initialsecuritynotificationsettingsync;
   // @@protoc_insertion_point(field_set_allocated:proto.ProtocolMessage.initialSecurityNotificationSettingSync)
 }
 
 // optional .proto.AppStateFatalExceptionNotification appStateFatalExceptionNotification = 10;
 inline bool ProtocolMessage::_internal_has_appstatefatalexceptionnotification() const {
-  bool value = (_has_bits_[0] & 0x00000020u) != 0;
-  PROTOBUF_ASSUME(!value || appstatefatalexceptionnotification_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.appstatefatalexceptionnotification_ != nullptr);
   return value;
 }
 inline bool ProtocolMessage::has_appstatefatalexceptionnotification() const {
   return _internal_has_appstatefatalexceptionnotification();
 }
 inline void ProtocolMessage::clear_appstatefatalexceptionnotification() {
-  if (appstatefatalexceptionnotification_ != nullptr) appstatefatalexceptionnotification_->Clear();
-  _has_bits_[0] &= ~0x00000020u;
+  if (_impl_.appstatefatalexceptionnotification_ != nullptr) _impl_.appstatefatalexceptionnotification_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000020u;
 }
 inline const ::proto::AppStateFatalExceptionNotification& ProtocolMessage::_internal_appstatefatalexceptionnotification() const {
-  const ::proto::AppStateFatalExceptionNotification* p = appstatefatalexceptionnotification_;
+  const ::proto::AppStateFatalExceptionNotification* p = _impl_.appstatefatalexceptionnotification_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::AppStateFatalExceptionNotification&>(
       ::proto::_AppStateFatalExceptionNotification_default_instance_);
 }
@@ -33211,20 +34597,20 @@ inline const ::proto::AppStateFatalExceptionNotification& ProtocolMessage::appst
 inline void ProtocolMessage::unsafe_arena_set_allocated_appstatefatalexceptionnotification(
     ::proto::AppStateFatalExceptionNotification* appstatefatalexceptionnotification) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(appstatefatalexceptionnotification_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.appstatefatalexceptionnotification_);
   }
-  appstatefatalexceptionnotification_ = appstatefatalexceptionnotification;
+  _impl_.appstatefatalexceptionnotification_ = appstatefatalexceptionnotification;
   if (appstatefatalexceptionnotification) {
-    _has_bits_[0] |= 0x00000020u;
+    _impl_._has_bits_[0] |= 0x00000020u;
   } else {
-    _has_bits_[0] &= ~0x00000020u;
+    _impl_._has_bits_[0] &= ~0x00000020u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.ProtocolMessage.appStateFatalExceptionNotification)
 }
 inline ::proto::AppStateFatalExceptionNotification* ProtocolMessage::release_appstatefatalexceptionnotification() {
-  _has_bits_[0] &= ~0x00000020u;
-  ::proto::AppStateFatalExceptionNotification* temp = appstatefatalexceptionnotification_;
-  appstatefatalexceptionnotification_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000020u;
+  ::proto::AppStateFatalExceptionNotification* temp = _impl_.appstatefatalexceptionnotification_;
+  _impl_.appstatefatalexceptionnotification_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -33238,18 +34624,18 @@ inline ::proto::AppStateFatalExceptionNotification* ProtocolMessage::release_app
 }
 inline ::proto::AppStateFatalExceptionNotification* ProtocolMessage::unsafe_arena_release_appstatefatalexceptionnotification() {
   // @@protoc_insertion_point(field_release:proto.ProtocolMessage.appStateFatalExceptionNotification)
-  _has_bits_[0] &= ~0x00000020u;
-  ::proto::AppStateFatalExceptionNotification* temp = appstatefatalexceptionnotification_;
-  appstatefatalexceptionnotification_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000020u;
+  ::proto::AppStateFatalExceptionNotification* temp = _impl_.appstatefatalexceptionnotification_;
+  _impl_.appstatefatalexceptionnotification_ = nullptr;
   return temp;
 }
 inline ::proto::AppStateFatalExceptionNotification* ProtocolMessage::_internal_mutable_appstatefatalexceptionnotification() {
-  _has_bits_[0] |= 0x00000020u;
-  if (appstatefatalexceptionnotification_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000020u;
+  if (_impl_.appstatefatalexceptionnotification_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::AppStateFatalExceptionNotification>(GetArenaForAllocation());
-    appstatefatalexceptionnotification_ = p;
+    _impl_.appstatefatalexceptionnotification_ = p;
   }
-  return appstatefatalexceptionnotification_;
+  return _impl_.appstatefatalexceptionnotification_;
 }
 inline ::proto::AppStateFatalExceptionNotification* ProtocolMessage::mutable_appstatefatalexceptionnotification() {
   ::proto::AppStateFatalExceptionNotification* _msg = _internal_mutable_appstatefatalexceptionnotification();
@@ -33259,20 +34645,20 @@ inline ::proto::AppStateFatalExceptionNotification* ProtocolMessage::mutable_app
 inline void ProtocolMessage::set_allocated_appstatefatalexceptionnotification(::proto::AppStateFatalExceptionNotification* appstatefatalexceptionnotification) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete appstatefatalexceptionnotification_;
+    delete _impl_.appstatefatalexceptionnotification_;
   }
   if (appstatefatalexceptionnotification) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::AppStateFatalExceptionNotification>::GetOwningArena(appstatefatalexceptionnotification);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(appstatefatalexceptionnotification);
     if (message_arena != submessage_arena) {
       appstatefatalexceptionnotification = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, appstatefatalexceptionnotification, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000020u;
+    _impl_._has_bits_[0] |= 0x00000020u;
   } else {
-    _has_bits_[0] &= ~0x00000020u;
+    _impl_._has_bits_[0] &= ~0x00000020u;
   }
-  appstatefatalexceptionnotification_ = appstatefatalexceptionnotification;
+  _impl_.appstatefatalexceptionnotification_ = appstatefatalexceptionnotification;
   // @@protoc_insertion_point(field_set_allocated:proto.ProtocolMessage.appStateFatalExceptionNotification)
 }
 
@@ -33282,15 +34668,15 @@ inline void ProtocolMessage::set_allocated_appstatefatalexceptionnotification(::
 
 // optional bytes fileSha256 = 1;
 inline bool HistorySyncNotification::_internal_has_filesha256() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool HistorySyncNotification::has_filesha256() const {
   return _internal_has_filesha256();
 }
 inline void HistorySyncNotification::clear_filesha256() {
-  filesha256_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.filesha256_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& HistorySyncNotification::filesha256() const {
   // @@protoc_insertion_point(field_get:proto.HistorySyncNotification.fileSha256)
@@ -33299,8 +34685,8 @@ inline const std::string& HistorySyncNotification::filesha256() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void HistorySyncNotification::set_filesha256(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- filesha256_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.filesha256_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.HistorySyncNotification.fileSha256)
 }
 inline std::string* HistorySyncNotification::mutable_filesha256() {
@@ -33309,74 +34695,84 @@ inline std::string* HistorySyncNotification::mutable_filesha256() {
   return _s;
 }
 inline const std::string& HistorySyncNotification::_internal_filesha256() const {
-  return filesha256_.Get();
+  return _impl_.filesha256_.Get();
 }
 inline void HistorySyncNotification::_internal_set_filesha256(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  filesha256_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.filesha256_.Set(value, GetArenaForAllocation());
 }
 inline std::string* HistorySyncNotification::_internal_mutable_filesha256() {
-  _has_bits_[0] |= 0x00000001u;
-  return filesha256_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.filesha256_.Mutable(GetArenaForAllocation());
 }
 inline std::string* HistorySyncNotification::release_filesha256() {
   // @@protoc_insertion_point(field_release:proto.HistorySyncNotification.fileSha256)
   if (!_internal_has_filesha256()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return filesha256_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.filesha256_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.filesha256_.IsDefault()) {
+    _impl_.filesha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void HistorySyncNotification::set_allocated_filesha256(std::string* filesha256) {
   if (filesha256 != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
+  }
+  _impl_.filesha256_.SetAllocated(filesha256, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.filesha256_.IsDefault()) {
+    _impl_.filesha256_.Set("", GetArenaForAllocation());
   }
-  filesha256_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), filesha256,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.HistorySyncNotification.fileSha256)
 }
 
 // optional uint64 fileLength = 2;
 inline bool HistorySyncNotification::_internal_has_filelength() const {
-  bool value = (_has_bits_[0] & 0x00000020u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
   return value;
 }
 inline bool HistorySyncNotification::has_filelength() const {
   return _internal_has_filelength();
 }
 inline void HistorySyncNotification::clear_filelength() {
-  filelength_ = uint64_t{0u};
-  _has_bits_[0] &= ~0x00000020u;
+  _impl_.filelength_ = uint64_t{0u};
+  _impl_._has_bits_[0] &= ~0x00000020u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 HistorySyncNotification::_internal_filelength() const {
-  return filelength_;
+inline uint64_t HistorySyncNotification::_internal_filelength() const {
+  return _impl_.filelength_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 HistorySyncNotification::filelength() const {
+inline uint64_t HistorySyncNotification::filelength() const {
   // @@protoc_insertion_point(field_get:proto.HistorySyncNotification.fileLength)
   return _internal_filelength();
 }
-inline void HistorySyncNotification::_internal_set_filelength(::PROTOBUF_NAMESPACE_ID::uint64 value) {
-  _has_bits_[0] |= 0x00000020u;
-  filelength_ = value;
+inline void HistorySyncNotification::_internal_set_filelength(uint64_t value) {
+  _impl_._has_bits_[0] |= 0x00000020u;
+  _impl_.filelength_ = value;
 }
-inline void HistorySyncNotification::set_filelength(::PROTOBUF_NAMESPACE_ID::uint64 value) {
+inline void HistorySyncNotification::set_filelength(uint64_t value) {
   _internal_set_filelength(value);
   // @@protoc_insertion_point(field_set:proto.HistorySyncNotification.fileLength)
 }
 
 // optional bytes mediaKey = 3;
 inline bool HistorySyncNotification::_internal_has_mediakey() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool HistorySyncNotification::has_mediakey() const {
   return _internal_has_mediakey();
 }
 inline void HistorySyncNotification::clear_mediakey() {
-  mediakey_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.mediakey_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& HistorySyncNotification::mediakey() const {
   // @@protoc_insertion_point(field_get:proto.HistorySyncNotification.mediaKey)
@@ -33385,8 +34781,8 @@ inline const std::string& HistorySyncNotification::mediakey() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void HistorySyncNotification::set_mediakey(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- mediakey_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.mediakey_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.HistorySyncNotification.mediaKey)
 }
 inline std::string* HistorySyncNotification::mutable_mediakey() {
@@ -33395,46 +34791,56 @@ inline std::string* HistorySyncNotification::mutable_mediakey() {
   return _s;
 }
 inline const std::string& HistorySyncNotification::_internal_mediakey() const {
-  return mediakey_.Get();
+  return _impl_.mediakey_.Get();
 }
 inline void HistorySyncNotification::_internal_set_mediakey(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  mediakey_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.mediakey_.Set(value, GetArenaForAllocation());
 }
 inline std::string* HistorySyncNotification::_internal_mutable_mediakey() {
-  _has_bits_[0] |= 0x00000002u;
-  return mediakey_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.mediakey_.Mutable(GetArenaForAllocation());
 }
 inline std::string* HistorySyncNotification::release_mediakey() {
   // @@protoc_insertion_point(field_release:proto.HistorySyncNotification.mediaKey)
   if (!_internal_has_mediakey()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return mediakey_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.mediakey_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.mediakey_.IsDefault()) {
+    _impl_.mediakey_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void HistorySyncNotification::set_allocated_mediakey(std::string* mediakey) {
   if (mediakey != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
+  }
+  _impl_.mediakey_.SetAllocated(mediakey, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.mediakey_.IsDefault()) {
+    _impl_.mediakey_.Set("", GetArenaForAllocation());
   }
-  mediakey_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), mediakey,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.HistorySyncNotification.mediaKey)
 }
 
 // optional bytes fileEncSha256 = 4;
 inline bool HistorySyncNotification::_internal_has_fileencsha256() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool HistorySyncNotification::has_fileencsha256() const {
   return _internal_has_fileencsha256();
 }
 inline void HistorySyncNotification::clear_fileencsha256() {
-  fileencsha256_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.fileencsha256_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const std::string& HistorySyncNotification::fileencsha256() const {
   // @@protoc_insertion_point(field_get:proto.HistorySyncNotification.fileEncSha256)
@@ -33443,8 +34849,8 @@ inline const std::string& HistorySyncNotification::fileencsha256() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void HistorySyncNotification::set_fileencsha256(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000004u;
- fileencsha256_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000004u;
+ _impl_.fileencsha256_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.HistorySyncNotification.fileEncSha256)
 }
 inline std::string* HistorySyncNotification::mutable_fileencsha256() {
@@ -33453,46 +34859,56 @@ inline std::string* HistorySyncNotification::mutable_fileencsha256() {
   return _s;
 }
 inline const std::string& HistorySyncNotification::_internal_fileencsha256() const {
-  return fileencsha256_.Get();
+  return _impl_.fileencsha256_.Get();
 }
 inline void HistorySyncNotification::_internal_set_fileencsha256(const std::string& value) {
-  _has_bits_[0] |= 0x00000004u;
-  fileencsha256_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.fileencsha256_.Set(value, GetArenaForAllocation());
 }
 inline std::string* HistorySyncNotification::_internal_mutable_fileencsha256() {
-  _has_bits_[0] |= 0x00000004u;
-  return fileencsha256_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  return _impl_.fileencsha256_.Mutable(GetArenaForAllocation());
 }
 inline std::string* HistorySyncNotification::release_fileencsha256() {
   // @@protoc_insertion_point(field_release:proto.HistorySyncNotification.fileEncSha256)
   if (!_internal_has_fileencsha256()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000004u;
-  return fileencsha256_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  auto* p = _impl_.fileencsha256_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.fileencsha256_.IsDefault()) {
+    _impl_.fileencsha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void HistorySyncNotification::set_allocated_fileencsha256(std::string* fileencsha256) {
   if (fileencsha256 != nullptr) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
+  }
+  _impl_.fileencsha256_.SetAllocated(fileencsha256, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.fileencsha256_.IsDefault()) {
+    _impl_.fileencsha256_.Set("", GetArenaForAllocation());
   }
-  fileencsha256_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), fileencsha256,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.HistorySyncNotification.fileEncSha256)
 }
 
 // optional string directPath = 5;
 inline bool HistorySyncNotification::_internal_has_directpath() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool HistorySyncNotification::has_directpath() const {
   return _internal_has_directpath();
 }
 inline void HistorySyncNotification::clear_directpath() {
-  directpath_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.directpath_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline const std::string& HistorySyncNotification::directpath() const {
   // @@protoc_insertion_point(field_get:proto.HistorySyncNotification.directPath)
@@ -33501,8 +34917,8 @@ inline const std::string& HistorySyncNotification::directpath() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void HistorySyncNotification::set_directpath(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000008u;
- directpath_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000008u;
+ _impl_.directpath_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.HistorySyncNotification.directPath)
 }
 inline std::string* HistorySyncNotification::mutable_directpath() {
@@ -33511,49 +34927,59 @@ inline std::string* HistorySyncNotification::mutable_directpath() {
   return _s;
 }
 inline const std::string& HistorySyncNotification::_internal_directpath() const {
-  return directpath_.Get();
+  return _impl_.directpath_.Get();
 }
 inline void HistorySyncNotification::_internal_set_directpath(const std::string& value) {
-  _has_bits_[0] |= 0x00000008u;
-  directpath_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.directpath_.Set(value, GetArenaForAllocation());
 }
 inline std::string* HistorySyncNotification::_internal_mutable_directpath() {
-  _has_bits_[0] |= 0x00000008u;
-  return directpath_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  return _impl_.directpath_.Mutable(GetArenaForAllocation());
 }
 inline std::string* HistorySyncNotification::release_directpath() {
   // @@protoc_insertion_point(field_release:proto.HistorySyncNotification.directPath)
   if (!_internal_has_directpath()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000008u;
-  return directpath_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  auto* p = _impl_.directpath_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.directpath_.IsDefault()) {
+    _impl_.directpath_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void HistorySyncNotification::set_allocated_directpath(std::string* directpath) {
   if (directpath != nullptr) {
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
+  }
+  _impl_.directpath_.SetAllocated(directpath, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.directpath_.IsDefault()) {
+    _impl_.directpath_.Set("", GetArenaForAllocation());
   }
-  directpath_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), directpath,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.HistorySyncNotification.directPath)
 }
 
 // optional .proto.HistorySyncNotification.HistorySyncNotificationHistorySyncType syncType = 6;
 inline bool HistorySyncNotification::_internal_has_synctype() const {
-  bool value = (_has_bits_[0] & 0x00000040u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
   return value;
 }
 inline bool HistorySyncNotification::has_synctype() const {
   return _internal_has_synctype();
 }
 inline void HistorySyncNotification::clear_synctype() {
-  synctype_ = 0;
-  _has_bits_[0] &= ~0x00000040u;
+  _impl_.synctype_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000040u;
 }
 inline ::proto::HistorySyncNotification_HistorySyncNotificationHistorySyncType HistorySyncNotification::_internal_synctype() const {
-  return static_cast< ::proto::HistorySyncNotification_HistorySyncNotificationHistorySyncType >(synctype_);
+  return static_cast< ::proto::HistorySyncNotification_HistorySyncNotificationHistorySyncType >(_impl_.synctype_);
 }
 inline ::proto::HistorySyncNotification_HistorySyncNotificationHistorySyncType HistorySyncNotification::synctype() const {
   // @@protoc_insertion_point(field_get:proto.HistorySyncNotification.syncType)
@@ -33561,8 +34987,8 @@ inline ::proto::HistorySyncNotification_HistorySyncNotificationHistorySyncType H
 }
 inline void HistorySyncNotification::_internal_set_synctype(::proto::HistorySyncNotification_HistorySyncNotificationHistorySyncType value) {
   assert(::proto::HistorySyncNotification_HistorySyncNotificationHistorySyncType_IsValid(value));
-  _has_bits_[0] |= 0x00000040u;
-  synctype_ = value;
+  _impl_._has_bits_[0] |= 0x00000040u;
+  _impl_.synctype_ = value;
 }
 inline void HistorySyncNotification::set_synctype(::proto::HistorySyncNotification_HistorySyncNotificationHistorySyncType value) {
   _internal_set_synctype(value);
@@ -33571,43 +34997,43 @@ inline void HistorySyncNotification::set_synctype(::proto::HistorySyncNotificati
 
 // optional uint32 chunkOrder = 7;
 inline bool HistorySyncNotification::_internal_has_chunkorder() const {
-  bool value = (_has_bits_[0] & 0x00000080u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000080u) != 0;
   return value;
 }
 inline bool HistorySyncNotification::has_chunkorder() const {
   return _internal_has_chunkorder();
 }
 inline void HistorySyncNotification::clear_chunkorder() {
-  chunkorder_ = 0u;
-  _has_bits_[0] &= ~0x00000080u;
+  _impl_.chunkorder_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000080u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 HistorySyncNotification::_internal_chunkorder() const {
-  return chunkorder_;
+inline uint32_t HistorySyncNotification::_internal_chunkorder() const {
+  return _impl_.chunkorder_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 HistorySyncNotification::chunkorder() const {
+inline uint32_t HistorySyncNotification::chunkorder() const {
   // @@protoc_insertion_point(field_get:proto.HistorySyncNotification.chunkOrder)
   return _internal_chunkorder();
 }
-inline void HistorySyncNotification::_internal_set_chunkorder(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000080u;
-  chunkorder_ = value;
+inline void HistorySyncNotification::_internal_set_chunkorder(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000080u;
+  _impl_.chunkorder_ = value;
 }
-inline void HistorySyncNotification::set_chunkorder(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void HistorySyncNotification::set_chunkorder(uint32_t value) {
   _internal_set_chunkorder(value);
   // @@protoc_insertion_point(field_set:proto.HistorySyncNotification.chunkOrder)
 }
 
 // optional string originalMessageId = 8;
 inline bool HistorySyncNotification::_internal_has_originalmessageid() const {
-  bool value = (_has_bits_[0] & 0x00000010u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
   return value;
 }
 inline bool HistorySyncNotification::has_originalmessageid() const {
   return _internal_has_originalmessageid();
 }
 inline void HistorySyncNotification::clear_originalmessageid() {
-  originalmessageid_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000010u;
+  _impl_.originalmessageid_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000010u;
 }
 inline const std::string& HistorySyncNotification::originalmessageid() const {
   // @@protoc_insertion_point(field_get:proto.HistorySyncNotification.originalMessageId)
@@ -33616,8 +35042,8 @@ inline const std::string& HistorySyncNotification::originalmessageid() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void HistorySyncNotification::set_originalmessageid(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000010u;
- originalmessageid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000010u;
+ _impl_.originalmessageid_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.HistorySyncNotification.originalMessageId)
 }
 inline std::string* HistorySyncNotification::mutable_originalmessageid() {
@@ -33626,32 +35052,42 @@ inline std::string* HistorySyncNotification::mutable_originalmessageid() {
   return _s;
 }
 inline const std::string& HistorySyncNotification::_internal_originalmessageid() const {
-  return originalmessageid_.Get();
+  return _impl_.originalmessageid_.Get();
 }
 inline void HistorySyncNotification::_internal_set_originalmessageid(const std::string& value) {
-  _has_bits_[0] |= 0x00000010u;
-  originalmessageid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  _impl_.originalmessageid_.Set(value, GetArenaForAllocation());
 }
 inline std::string* HistorySyncNotification::_internal_mutable_originalmessageid() {
-  _has_bits_[0] |= 0x00000010u;
-  return originalmessageid_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  return _impl_.originalmessageid_.Mutable(GetArenaForAllocation());
 }
 inline std::string* HistorySyncNotification::release_originalmessageid() {
   // @@protoc_insertion_point(field_release:proto.HistorySyncNotification.originalMessageId)
   if (!_internal_has_originalmessageid()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000010u;
-  return originalmessageid_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000010u;
+  auto* p = _impl_.originalmessageid_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.originalmessageid_.IsDefault()) {
+    _impl_.originalmessageid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void HistorySyncNotification::set_allocated_originalmessageid(std::string* originalmessageid) {
   if (originalmessageid != nullptr) {
-    _has_bits_[0] |= 0x00000010u;
+    _impl_._has_bits_[0] |= 0x00000010u;
   } else {
-    _has_bits_[0] &= ~0x00000010u;
+    _impl_._has_bits_[0] &= ~0x00000010u;
   }
-  originalmessageid_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), originalmessageid,
-      GetArenaForAllocation());
+  _impl_.originalmessageid_.SetAllocated(originalmessageid, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.originalmessageid_.IsDefault()) {
+    _impl_.originalmessageid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.HistorySyncNotification.originalMessageId)
 }
 
@@ -33661,19 +35097,19 @@ inline void HistorySyncNotification::set_allocated_originalmessageid(std::string
 
 // optional .proto.AppStateSyncKeyId keyId = 1;
 inline bool AppStateSyncKey::_internal_has_keyid() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || keyid_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.keyid_ != nullptr);
   return value;
 }
 inline bool AppStateSyncKey::has_keyid() const {
   return _internal_has_keyid();
 }
 inline void AppStateSyncKey::clear_keyid() {
-  if (keyid_ != nullptr) keyid_->Clear();
-  _has_bits_[0] &= ~0x00000001u;
+  if (_impl_.keyid_ != nullptr) _impl_.keyid_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const ::proto::AppStateSyncKeyId& AppStateSyncKey::_internal_keyid() const {
-  const ::proto::AppStateSyncKeyId* p = keyid_;
+  const ::proto::AppStateSyncKeyId* p = _impl_.keyid_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::AppStateSyncKeyId&>(
       ::proto::_AppStateSyncKeyId_default_instance_);
 }
@@ -33684,20 +35120,20 @@ inline const ::proto::AppStateSyncKeyId& AppStateSyncKey::keyid() const {
 inline void AppStateSyncKey::unsafe_arena_set_allocated_keyid(
     ::proto::AppStateSyncKeyId* keyid) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(keyid_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.keyid_);
   }
-  keyid_ = keyid;
+  _impl_.keyid_ = keyid;
   if (keyid) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.AppStateSyncKey.keyId)
 }
 inline ::proto::AppStateSyncKeyId* AppStateSyncKey::release_keyid() {
-  _has_bits_[0] &= ~0x00000001u;
-  ::proto::AppStateSyncKeyId* temp = keyid_;
-  keyid_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  ::proto::AppStateSyncKeyId* temp = _impl_.keyid_;
+  _impl_.keyid_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -33711,18 +35147,18 @@ inline ::proto::AppStateSyncKeyId* AppStateSyncKey::release_keyid() {
 }
 inline ::proto::AppStateSyncKeyId* AppStateSyncKey::unsafe_arena_release_keyid() {
   // @@protoc_insertion_point(field_release:proto.AppStateSyncKey.keyId)
-  _has_bits_[0] &= ~0x00000001u;
-  ::proto::AppStateSyncKeyId* temp = keyid_;
-  keyid_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  ::proto::AppStateSyncKeyId* temp = _impl_.keyid_;
+  _impl_.keyid_ = nullptr;
   return temp;
 }
 inline ::proto::AppStateSyncKeyId* AppStateSyncKey::_internal_mutable_keyid() {
-  _has_bits_[0] |= 0x00000001u;
-  if (keyid_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000001u;
+  if (_impl_.keyid_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::AppStateSyncKeyId>(GetArenaForAllocation());
-    keyid_ = p;
+    _impl_.keyid_ = p;
   }
-  return keyid_;
+  return _impl_.keyid_;
 }
 inline ::proto::AppStateSyncKeyId* AppStateSyncKey::mutable_keyid() {
   ::proto::AppStateSyncKeyId* _msg = _internal_mutable_keyid();
@@ -33732,38 +35168,38 @@ inline ::proto::AppStateSyncKeyId* AppStateSyncKey::mutable_keyid() {
 inline void AppStateSyncKey::set_allocated_keyid(::proto::AppStateSyncKeyId* keyid) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete keyid_;
+    delete _impl_.keyid_;
   }
   if (keyid) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::AppStateSyncKeyId>::GetOwningArena(keyid);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(keyid);
     if (message_arena != submessage_arena) {
       keyid = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, keyid, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  keyid_ = keyid;
+  _impl_.keyid_ = keyid;
   // @@protoc_insertion_point(field_set_allocated:proto.AppStateSyncKey.keyId)
 }
 
 // optional .proto.AppStateSyncKeyData keyData = 2;
 inline bool AppStateSyncKey::_internal_has_keydata() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || keydata_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.keydata_ != nullptr);
   return value;
 }
 inline bool AppStateSyncKey::has_keydata() const {
   return _internal_has_keydata();
 }
 inline void AppStateSyncKey::clear_keydata() {
-  if (keydata_ != nullptr) keydata_->Clear();
-  _has_bits_[0] &= ~0x00000002u;
+  if (_impl_.keydata_ != nullptr) _impl_.keydata_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const ::proto::AppStateSyncKeyData& AppStateSyncKey::_internal_keydata() const {
-  const ::proto::AppStateSyncKeyData* p = keydata_;
+  const ::proto::AppStateSyncKeyData* p = _impl_.keydata_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::AppStateSyncKeyData&>(
       ::proto::_AppStateSyncKeyData_default_instance_);
 }
@@ -33774,20 +35210,20 @@ inline const ::proto::AppStateSyncKeyData& AppStateSyncKey::keydata() const {
 inline void AppStateSyncKey::unsafe_arena_set_allocated_keydata(
     ::proto::AppStateSyncKeyData* keydata) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(keydata_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.keydata_);
   }
-  keydata_ = keydata;
+  _impl_.keydata_ = keydata;
   if (keydata) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.AppStateSyncKey.keyData)
 }
 inline ::proto::AppStateSyncKeyData* AppStateSyncKey::release_keydata() {
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::AppStateSyncKeyData* temp = keydata_;
-  keydata_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::AppStateSyncKeyData* temp = _impl_.keydata_;
+  _impl_.keydata_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -33801,18 +35237,18 @@ inline ::proto::AppStateSyncKeyData* AppStateSyncKey::release_keydata() {
 }
 inline ::proto::AppStateSyncKeyData* AppStateSyncKey::unsafe_arena_release_keydata() {
   // @@protoc_insertion_point(field_release:proto.AppStateSyncKey.keyData)
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::AppStateSyncKeyData* temp = keydata_;
-  keydata_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::AppStateSyncKeyData* temp = _impl_.keydata_;
+  _impl_.keydata_ = nullptr;
   return temp;
 }
 inline ::proto::AppStateSyncKeyData* AppStateSyncKey::_internal_mutable_keydata() {
-  _has_bits_[0] |= 0x00000002u;
-  if (keydata_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000002u;
+  if (_impl_.keydata_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::AppStateSyncKeyData>(GetArenaForAllocation());
-    keydata_ = p;
+    _impl_.keydata_ = p;
   }
-  return keydata_;
+  return _impl_.keydata_;
 }
 inline ::proto::AppStateSyncKeyData* AppStateSyncKey::mutable_keydata() {
   ::proto::AppStateSyncKeyData* _msg = _internal_mutable_keydata();
@@ -33822,20 +35258,20 @@ inline ::proto::AppStateSyncKeyData* AppStateSyncKey::mutable_keydata() {
 inline void AppStateSyncKey::set_allocated_keydata(::proto::AppStateSyncKeyData* keydata) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete keydata_;
+    delete _impl_.keydata_;
   }
   if (keydata) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::AppStateSyncKeyData>::GetOwningArena(keydata);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(keydata);
     if (message_arena != submessage_arena) {
       keydata = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, keydata, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  keydata_ = keydata;
+  _impl_.keydata_ = keydata;
   // @@protoc_insertion_point(field_set_allocated:proto.AppStateSyncKey.keyData)
 }
 
@@ -33845,15 +35281,15 @@ inline void AppStateSyncKey::set_allocated_keydata(::proto::AppStateSyncKeyData*
 
 // optional bytes keyId = 1;
 inline bool AppStateSyncKeyId::_internal_has_keyid() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool AppStateSyncKeyId::has_keyid() const {
   return _internal_has_keyid();
 }
 inline void AppStateSyncKeyId::clear_keyid() {
-  keyid_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.keyid_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& AppStateSyncKeyId::keyid() const {
   // @@protoc_insertion_point(field_get:proto.AppStateSyncKeyId.keyId)
@@ -33862,8 +35298,8 @@ inline const std::string& AppStateSyncKeyId::keyid() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void AppStateSyncKeyId::set_keyid(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- keyid_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.keyid_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.AppStateSyncKeyId.keyId)
 }
 inline std::string* AppStateSyncKeyId::mutable_keyid() {
@@ -33872,32 +35308,42 @@ inline std::string* AppStateSyncKeyId::mutable_keyid() {
   return _s;
 }
 inline const std::string& AppStateSyncKeyId::_internal_keyid() const {
-  return keyid_.Get();
+  return _impl_.keyid_.Get();
 }
 inline void AppStateSyncKeyId::_internal_set_keyid(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  keyid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.keyid_.Set(value, GetArenaForAllocation());
 }
 inline std::string* AppStateSyncKeyId::_internal_mutable_keyid() {
-  _has_bits_[0] |= 0x00000001u;
-  return keyid_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.keyid_.Mutable(GetArenaForAllocation());
 }
 inline std::string* AppStateSyncKeyId::release_keyid() {
   // @@protoc_insertion_point(field_release:proto.AppStateSyncKeyId.keyId)
   if (!_internal_has_keyid()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return keyid_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.keyid_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.keyid_.IsDefault()) {
+    _impl_.keyid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void AppStateSyncKeyId::set_allocated_keyid(std::string* keyid) {
   if (keyid != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  keyid_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), keyid,
-      GetArenaForAllocation());
+  _impl_.keyid_.SetAllocated(keyid, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.keyid_.IsDefault()) {
+    _impl_.keyid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.AppStateSyncKeyId.keyId)
 }
 
@@ -33907,102 +35353,102 @@ inline void AppStateSyncKeyId::set_allocated_keyid(std::string* keyid) {
 
 // optional uint32 rawId = 1;
 inline bool AppStateSyncKeyFingerprint::_internal_has_rawid() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool AppStateSyncKeyFingerprint::has_rawid() const {
   return _internal_has_rawid();
 }
 inline void AppStateSyncKeyFingerprint::clear_rawid() {
-  rawid_ = 0u;
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.rawid_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 AppStateSyncKeyFingerprint::_internal_rawid() const {
-  return rawid_;
+inline uint32_t AppStateSyncKeyFingerprint::_internal_rawid() const {
+  return _impl_.rawid_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 AppStateSyncKeyFingerprint::rawid() const {
+inline uint32_t AppStateSyncKeyFingerprint::rawid() const {
   // @@protoc_insertion_point(field_get:proto.AppStateSyncKeyFingerprint.rawId)
   return _internal_rawid();
 }
-inline void AppStateSyncKeyFingerprint::_internal_set_rawid(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000001u;
-  rawid_ = value;
+inline void AppStateSyncKeyFingerprint::_internal_set_rawid(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.rawid_ = value;
 }
-inline void AppStateSyncKeyFingerprint::set_rawid(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void AppStateSyncKeyFingerprint::set_rawid(uint32_t value) {
   _internal_set_rawid(value);
   // @@protoc_insertion_point(field_set:proto.AppStateSyncKeyFingerprint.rawId)
 }
 
 // optional uint32 currentIndex = 2;
 inline bool AppStateSyncKeyFingerprint::_internal_has_currentindex() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool AppStateSyncKeyFingerprint::has_currentindex() const {
   return _internal_has_currentindex();
 }
 inline void AppStateSyncKeyFingerprint::clear_currentindex() {
-  currentindex_ = 0u;
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.currentindex_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 AppStateSyncKeyFingerprint::_internal_currentindex() const {
-  return currentindex_;
+inline uint32_t AppStateSyncKeyFingerprint::_internal_currentindex() const {
+  return _impl_.currentindex_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 AppStateSyncKeyFingerprint::currentindex() const {
+inline uint32_t AppStateSyncKeyFingerprint::currentindex() const {
   // @@protoc_insertion_point(field_get:proto.AppStateSyncKeyFingerprint.currentIndex)
   return _internal_currentindex();
 }
-inline void AppStateSyncKeyFingerprint::_internal_set_currentindex(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000002u;
-  currentindex_ = value;
+inline void AppStateSyncKeyFingerprint::_internal_set_currentindex(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.currentindex_ = value;
 }
-inline void AppStateSyncKeyFingerprint::set_currentindex(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void AppStateSyncKeyFingerprint::set_currentindex(uint32_t value) {
   _internal_set_currentindex(value);
   // @@protoc_insertion_point(field_set:proto.AppStateSyncKeyFingerprint.currentIndex)
 }
 
 // repeated uint32 deviceIndexes = 3 [packed = true];
 inline int AppStateSyncKeyFingerprint::_internal_deviceindexes_size() const {
-  return deviceindexes_.size();
+  return _impl_.deviceindexes_.size();
 }
 inline int AppStateSyncKeyFingerprint::deviceindexes_size() const {
   return _internal_deviceindexes_size();
 }
 inline void AppStateSyncKeyFingerprint::clear_deviceindexes() {
-  deviceindexes_.Clear();
+  _impl_.deviceindexes_.Clear();
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 AppStateSyncKeyFingerprint::_internal_deviceindexes(int index) const {
-  return deviceindexes_.Get(index);
+inline uint32_t AppStateSyncKeyFingerprint::_internal_deviceindexes(int index) const {
+  return _impl_.deviceindexes_.Get(index);
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 AppStateSyncKeyFingerprint::deviceindexes(int index) const {
+inline uint32_t AppStateSyncKeyFingerprint::deviceindexes(int index) const {
   // @@protoc_insertion_point(field_get:proto.AppStateSyncKeyFingerprint.deviceIndexes)
   return _internal_deviceindexes(index);
 }
-inline void AppStateSyncKeyFingerprint::set_deviceindexes(int index, ::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  deviceindexes_.Set(index, value);
+inline void AppStateSyncKeyFingerprint::set_deviceindexes(int index, uint32_t value) {
+  _impl_.deviceindexes_.Set(index, value);
   // @@protoc_insertion_point(field_set:proto.AppStateSyncKeyFingerprint.deviceIndexes)
 }
-inline void AppStateSyncKeyFingerprint::_internal_add_deviceindexes(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  deviceindexes_.Add(value);
+inline void AppStateSyncKeyFingerprint::_internal_add_deviceindexes(uint32_t value) {
+  _impl_.deviceindexes_.Add(value);
 }
-inline void AppStateSyncKeyFingerprint::add_deviceindexes(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void AppStateSyncKeyFingerprint::add_deviceindexes(uint32_t value) {
   _internal_add_deviceindexes(value);
   // @@protoc_insertion_point(field_add:proto.AppStateSyncKeyFingerprint.deviceIndexes)
 }
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >&
+inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >&
 AppStateSyncKeyFingerprint::_internal_deviceindexes() const {
-  return deviceindexes_;
+  return _impl_.deviceindexes_;
 }
-inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >&
+inline const ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >&
 AppStateSyncKeyFingerprint::deviceindexes() const {
   // @@protoc_insertion_point(field_list:proto.AppStateSyncKeyFingerprint.deviceIndexes)
   return _internal_deviceindexes();
 }
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >*
+inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >*
 AppStateSyncKeyFingerprint::_internal_mutable_deviceindexes() {
-  return &deviceindexes_;
+  return &_impl_.deviceindexes_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< ::PROTOBUF_NAMESPACE_ID::uint32 >*
+inline ::PROTOBUF_NAMESPACE_ID::RepeatedField< uint32_t >*
 AppStateSyncKeyFingerprint::mutable_deviceindexes() {
   // @@protoc_insertion_point(field_mutable_list:proto.AppStateSyncKeyFingerprint.deviceIndexes)
   return _internal_mutable_deviceindexes();
@@ -34014,15 +35460,15 @@ AppStateSyncKeyFingerprint::mutable_deviceindexes() {
 
 // optional bytes keyData = 1;
 inline bool AppStateSyncKeyData::_internal_has_keydata() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool AppStateSyncKeyData::has_keydata() const {
   return _internal_has_keydata();
 }
 inline void AppStateSyncKeyData::clear_keydata() {
-  keydata_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.keydata_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& AppStateSyncKeyData::keydata() const {
   // @@protoc_insertion_point(field_get:proto.AppStateSyncKeyData.keyData)
@@ -34031,8 +35477,8 @@ inline const std::string& AppStateSyncKeyData::keydata() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void AppStateSyncKeyData::set_keydata(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- keydata_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.keydata_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.AppStateSyncKeyData.keyData)
 }
 inline std::string* AppStateSyncKeyData::mutable_keydata() {
@@ -34041,50 +35487,60 @@ inline std::string* AppStateSyncKeyData::mutable_keydata() {
   return _s;
 }
 inline const std::string& AppStateSyncKeyData::_internal_keydata() const {
-  return keydata_.Get();
+  return _impl_.keydata_.Get();
 }
 inline void AppStateSyncKeyData::_internal_set_keydata(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  keydata_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.keydata_.Set(value, GetArenaForAllocation());
 }
 inline std::string* AppStateSyncKeyData::_internal_mutable_keydata() {
-  _has_bits_[0] |= 0x00000001u;
-  return keydata_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.keydata_.Mutable(GetArenaForAllocation());
 }
 inline std::string* AppStateSyncKeyData::release_keydata() {
   // @@protoc_insertion_point(field_release:proto.AppStateSyncKeyData.keyData)
   if (!_internal_has_keydata()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return keydata_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.keydata_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.keydata_.IsDefault()) {
+    _impl_.keydata_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void AppStateSyncKeyData::set_allocated_keydata(std::string* keydata) {
   if (keydata != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  keydata_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), keydata,
-      GetArenaForAllocation());
+  _impl_.keydata_.SetAllocated(keydata, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.keydata_.IsDefault()) {
+    _impl_.keydata_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.AppStateSyncKeyData.keyData)
 }
 
 // optional .proto.AppStateSyncKeyFingerprint fingerprint = 2;
 inline bool AppStateSyncKeyData::_internal_has_fingerprint() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || fingerprint_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.fingerprint_ != nullptr);
   return value;
 }
 inline bool AppStateSyncKeyData::has_fingerprint() const {
   return _internal_has_fingerprint();
 }
 inline void AppStateSyncKeyData::clear_fingerprint() {
-  if (fingerprint_ != nullptr) fingerprint_->Clear();
-  _has_bits_[0] &= ~0x00000002u;
+  if (_impl_.fingerprint_ != nullptr) _impl_.fingerprint_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const ::proto::AppStateSyncKeyFingerprint& AppStateSyncKeyData::_internal_fingerprint() const {
-  const ::proto::AppStateSyncKeyFingerprint* p = fingerprint_;
+  const ::proto::AppStateSyncKeyFingerprint* p = _impl_.fingerprint_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::AppStateSyncKeyFingerprint&>(
       ::proto::_AppStateSyncKeyFingerprint_default_instance_);
 }
@@ -34095,20 +35551,20 @@ inline const ::proto::AppStateSyncKeyFingerprint& AppStateSyncKeyData::fingerpri
 inline void AppStateSyncKeyData::unsafe_arena_set_allocated_fingerprint(
     ::proto::AppStateSyncKeyFingerprint* fingerprint) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(fingerprint_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.fingerprint_);
   }
-  fingerprint_ = fingerprint;
+  _impl_.fingerprint_ = fingerprint;
   if (fingerprint) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.AppStateSyncKeyData.fingerprint)
 }
 inline ::proto::AppStateSyncKeyFingerprint* AppStateSyncKeyData::release_fingerprint() {
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::AppStateSyncKeyFingerprint* temp = fingerprint_;
-  fingerprint_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::AppStateSyncKeyFingerprint* temp = _impl_.fingerprint_;
+  _impl_.fingerprint_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -34122,18 +35578,18 @@ inline ::proto::AppStateSyncKeyFingerprint* AppStateSyncKeyData::release_fingerp
 }
 inline ::proto::AppStateSyncKeyFingerprint* AppStateSyncKeyData::unsafe_arena_release_fingerprint() {
   // @@protoc_insertion_point(field_release:proto.AppStateSyncKeyData.fingerprint)
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::AppStateSyncKeyFingerprint* temp = fingerprint_;
-  fingerprint_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::AppStateSyncKeyFingerprint* temp = _impl_.fingerprint_;
+  _impl_.fingerprint_ = nullptr;
   return temp;
 }
 inline ::proto::AppStateSyncKeyFingerprint* AppStateSyncKeyData::_internal_mutable_fingerprint() {
-  _has_bits_[0] |= 0x00000002u;
-  if (fingerprint_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000002u;
+  if (_impl_.fingerprint_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::AppStateSyncKeyFingerprint>(GetArenaForAllocation());
-    fingerprint_ = p;
+    _impl_.fingerprint_ = p;
   }
-  return fingerprint_;
+  return _impl_.fingerprint_;
 }
 inline ::proto::AppStateSyncKeyFingerprint* AppStateSyncKeyData::mutable_fingerprint() {
   ::proto::AppStateSyncKeyFingerprint* _msg = _internal_mutable_fingerprint();
@@ -34143,47 +35599,47 @@ inline ::proto::AppStateSyncKeyFingerprint* AppStateSyncKeyData::mutable_fingerp
 inline void AppStateSyncKeyData::set_allocated_fingerprint(::proto::AppStateSyncKeyFingerprint* fingerprint) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete fingerprint_;
+    delete _impl_.fingerprint_;
   }
   if (fingerprint) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::AppStateSyncKeyFingerprint>::GetOwningArena(fingerprint);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(fingerprint);
     if (message_arena != submessage_arena) {
       fingerprint = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, fingerprint, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  fingerprint_ = fingerprint;
+  _impl_.fingerprint_ = fingerprint;
   // @@protoc_insertion_point(field_set_allocated:proto.AppStateSyncKeyData.fingerprint)
 }
 
 // optional int64 timestamp = 3;
 inline bool AppStateSyncKeyData::_internal_has_timestamp() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool AppStateSyncKeyData::has_timestamp() const {
   return _internal_has_timestamp();
 }
 inline void AppStateSyncKeyData::clear_timestamp() {
-  timestamp_ = int64_t{0};
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.timestamp_ = int64_t{0};
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 AppStateSyncKeyData::_internal_timestamp() const {
-  return timestamp_;
+inline int64_t AppStateSyncKeyData::_internal_timestamp() const {
+  return _impl_.timestamp_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 AppStateSyncKeyData::timestamp() const {
+inline int64_t AppStateSyncKeyData::timestamp() const {
   // @@protoc_insertion_point(field_get:proto.AppStateSyncKeyData.timestamp)
   return _internal_timestamp();
 }
-inline void AppStateSyncKeyData::_internal_set_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value) {
-  _has_bits_[0] |= 0x00000004u;
-  timestamp_ = value;
+inline void AppStateSyncKeyData::_internal_set_timestamp(int64_t value) {
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.timestamp_ = value;
 }
-inline void AppStateSyncKeyData::set_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value) {
+inline void AppStateSyncKeyData::set_timestamp(int64_t value) {
   _internal_set_timestamp(value);
   // @@protoc_insertion_point(field_set:proto.AppStateSyncKeyData.timestamp)
 }
@@ -34194,32 +35650,32 @@ inline void AppStateSyncKeyData::set_timestamp(::PROTOBUF_NAMESPACE_ID::int64 va
 
 // repeated .proto.AppStateSyncKey keys = 1;
 inline int AppStateSyncKeyShare::_internal_keys_size() const {
-  return keys_.size();
+  return _impl_.keys_.size();
 }
 inline int AppStateSyncKeyShare::keys_size() const {
   return _internal_keys_size();
 }
 inline void AppStateSyncKeyShare::clear_keys() {
-  keys_.Clear();
+  _impl_.keys_.Clear();
 }
 inline ::proto::AppStateSyncKey* AppStateSyncKeyShare::mutable_keys(int index) {
   // @@protoc_insertion_point(field_mutable:proto.AppStateSyncKeyShare.keys)
-  return keys_.Mutable(index);
+  return _impl_.keys_.Mutable(index);
 }
 inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::AppStateSyncKey >*
 AppStateSyncKeyShare::mutable_keys() {
   // @@protoc_insertion_point(field_mutable_list:proto.AppStateSyncKeyShare.keys)
-  return &keys_;
+  return &_impl_.keys_;
 }
 inline const ::proto::AppStateSyncKey& AppStateSyncKeyShare::_internal_keys(int index) const {
-  return keys_.Get(index);
+  return _impl_.keys_.Get(index);
 }
 inline const ::proto::AppStateSyncKey& AppStateSyncKeyShare::keys(int index) const {
   // @@protoc_insertion_point(field_get:proto.AppStateSyncKeyShare.keys)
   return _internal_keys(index);
 }
 inline ::proto::AppStateSyncKey* AppStateSyncKeyShare::_internal_add_keys() {
-  return keys_.Add();
+  return _impl_.keys_.Add();
 }
 inline ::proto::AppStateSyncKey* AppStateSyncKeyShare::add_keys() {
   ::proto::AppStateSyncKey* _add = _internal_add_keys();
@@ -34229,7 +35685,7 @@ inline ::proto::AppStateSyncKey* AppStateSyncKeyShare::add_keys() {
 inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::AppStateSyncKey >&
 AppStateSyncKeyShare::keys() const {
   // @@protoc_insertion_point(field_list:proto.AppStateSyncKeyShare.keys)
-  return keys_;
+  return _impl_.keys_;
 }
 
 // -------------------------------------------------------------------
@@ -34238,32 +35694,32 @@ AppStateSyncKeyShare::keys() const {
 
 // repeated .proto.AppStateSyncKeyId keyIds = 1;
 inline int AppStateSyncKeyRequest::_internal_keyids_size() const {
-  return keyids_.size();
+  return _impl_.keyids_.size();
 }
 inline int AppStateSyncKeyRequest::keyids_size() const {
   return _internal_keyids_size();
 }
 inline void AppStateSyncKeyRequest::clear_keyids() {
-  keyids_.Clear();
+  _impl_.keyids_.Clear();
 }
 inline ::proto::AppStateSyncKeyId* AppStateSyncKeyRequest::mutable_keyids(int index) {
   // @@protoc_insertion_point(field_mutable:proto.AppStateSyncKeyRequest.keyIds)
-  return keyids_.Mutable(index);
+  return _impl_.keyids_.Mutable(index);
 }
 inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::AppStateSyncKeyId >*
 AppStateSyncKeyRequest::mutable_keyids() {
   // @@protoc_insertion_point(field_mutable_list:proto.AppStateSyncKeyRequest.keyIds)
-  return &keyids_;
+  return &_impl_.keyids_;
 }
 inline const ::proto::AppStateSyncKeyId& AppStateSyncKeyRequest::_internal_keyids(int index) const {
-  return keyids_.Get(index);
+  return _impl_.keyids_.Get(index);
 }
 inline const ::proto::AppStateSyncKeyId& AppStateSyncKeyRequest::keyids(int index) const {
   // @@protoc_insertion_point(field_get:proto.AppStateSyncKeyRequest.keyIds)
   return _internal_keyids(index);
 }
 inline ::proto::AppStateSyncKeyId* AppStateSyncKeyRequest::_internal_add_keyids() {
-  return keyids_.Add();
+  return _impl_.keyids_.Add();
 }
 inline ::proto::AppStateSyncKeyId* AppStateSyncKeyRequest::add_keyids() {
   ::proto::AppStateSyncKeyId* _add = _internal_add_keyids();
@@ -34273,7 +35729,7 @@ inline ::proto::AppStateSyncKeyId* AppStateSyncKeyRequest::add_keyids() {
 inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::AppStateSyncKeyId >&
 AppStateSyncKeyRequest::keyids() const {
   // @@protoc_insertion_point(field_list:proto.AppStateSyncKeyRequest.keyIds)
-  return keyids_;
+  return _impl_.keyids_;
 }
 
 // -------------------------------------------------------------------
@@ -34282,13 +35738,13 @@ AppStateSyncKeyRequest::keyids() const {
 
 // repeated string collectionNames = 1;
 inline int AppStateFatalExceptionNotification::_internal_collectionnames_size() const {
-  return collectionnames_.size();
+  return _impl_.collectionnames_.size();
 }
 inline int AppStateFatalExceptionNotification::collectionnames_size() const {
   return _internal_collectionnames_size();
 }
 inline void AppStateFatalExceptionNotification::clear_collectionnames() {
-  collectionnames_.Clear();
+  _impl_.collectionnames_.Clear();
 }
 inline std::string* AppStateFatalExceptionNotification::add_collectionnames() {
   std::string* _s = _internal_add_collectionnames();
@@ -34296,7 +35752,7 @@ inline std::string* AppStateFatalExceptionNotification::add_collectionnames() {
   return _s;
 }
 inline const std::string& AppStateFatalExceptionNotification::_internal_collectionnames(int index) const {
-  return collectionnames_.Get(index);
+  return _impl_.collectionnames_.Get(index);
 }
 inline const std::string& AppStateFatalExceptionNotification::collectionnames(int index) const {
   // @@protoc_insertion_point(field_get:proto.AppStateFatalExceptionNotification.collectionNames)
@@ -34304,81 +35760,81 @@ inline const std::string& AppStateFatalExceptionNotification::collectionnames(in
 }
 inline std::string* AppStateFatalExceptionNotification::mutable_collectionnames(int index) {
   // @@protoc_insertion_point(field_mutable:proto.AppStateFatalExceptionNotification.collectionNames)
-  return collectionnames_.Mutable(index);
+  return _impl_.collectionnames_.Mutable(index);
 }
 inline void AppStateFatalExceptionNotification::set_collectionnames(int index, const std::string& value) {
-  collectionnames_.Mutable(index)->assign(value);
+  _impl_.collectionnames_.Mutable(index)->assign(value);
   // @@protoc_insertion_point(field_set:proto.AppStateFatalExceptionNotification.collectionNames)
 }
 inline void AppStateFatalExceptionNotification::set_collectionnames(int index, std::string&& value) {
-  collectionnames_.Mutable(index)->assign(std::move(value));
+  _impl_.collectionnames_.Mutable(index)->assign(std::move(value));
   // @@protoc_insertion_point(field_set:proto.AppStateFatalExceptionNotification.collectionNames)
 }
 inline void AppStateFatalExceptionNotification::set_collectionnames(int index, const char* value) {
   GOOGLE_DCHECK(value != nullptr);
-  collectionnames_.Mutable(index)->assign(value);
+  _impl_.collectionnames_.Mutable(index)->assign(value);
   // @@protoc_insertion_point(field_set_char:proto.AppStateFatalExceptionNotification.collectionNames)
 }
 inline void AppStateFatalExceptionNotification::set_collectionnames(int index, const char* value, size_t size) {
-  collectionnames_.Mutable(index)->assign(
+  _impl_.collectionnames_.Mutable(index)->assign(
     reinterpret_cast<const char*>(value), size);
   // @@protoc_insertion_point(field_set_pointer:proto.AppStateFatalExceptionNotification.collectionNames)
 }
 inline std::string* AppStateFatalExceptionNotification::_internal_add_collectionnames() {
-  return collectionnames_.Add();
+  return _impl_.collectionnames_.Add();
 }
 inline void AppStateFatalExceptionNotification::add_collectionnames(const std::string& value) {
-  collectionnames_.Add()->assign(value);
+  _impl_.collectionnames_.Add()->assign(value);
   // @@protoc_insertion_point(field_add:proto.AppStateFatalExceptionNotification.collectionNames)
 }
 inline void AppStateFatalExceptionNotification::add_collectionnames(std::string&& value) {
-  collectionnames_.Add(std::move(value));
+  _impl_.collectionnames_.Add(std::move(value));
   // @@protoc_insertion_point(field_add:proto.AppStateFatalExceptionNotification.collectionNames)
 }
 inline void AppStateFatalExceptionNotification::add_collectionnames(const char* value) {
   GOOGLE_DCHECK(value != nullptr);
-  collectionnames_.Add()->assign(value);
+  _impl_.collectionnames_.Add()->assign(value);
   // @@protoc_insertion_point(field_add_char:proto.AppStateFatalExceptionNotification.collectionNames)
 }
 inline void AppStateFatalExceptionNotification::add_collectionnames(const char* value, size_t size) {
-  collectionnames_.Add()->assign(reinterpret_cast<const char*>(value), size);
+  _impl_.collectionnames_.Add()->assign(reinterpret_cast<const char*>(value), size);
   // @@protoc_insertion_point(field_add_pointer:proto.AppStateFatalExceptionNotification.collectionNames)
 }
 inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>&
 AppStateFatalExceptionNotification::collectionnames() const {
   // @@protoc_insertion_point(field_list:proto.AppStateFatalExceptionNotification.collectionNames)
-  return collectionnames_;
+  return _impl_.collectionnames_;
 }
 inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>*
 AppStateFatalExceptionNotification::mutable_collectionnames() {
   // @@protoc_insertion_point(field_mutable_list:proto.AppStateFatalExceptionNotification.collectionNames)
-  return &collectionnames_;
+  return &_impl_.collectionnames_;
 }
 
 // optional int64 timestamp = 2;
 inline bool AppStateFatalExceptionNotification::_internal_has_timestamp() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool AppStateFatalExceptionNotification::has_timestamp() const {
   return _internal_has_timestamp();
 }
 inline void AppStateFatalExceptionNotification::clear_timestamp() {
-  timestamp_ = int64_t{0};
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.timestamp_ = int64_t{0};
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 AppStateFatalExceptionNotification::_internal_timestamp() const {
-  return timestamp_;
+inline int64_t AppStateFatalExceptionNotification::_internal_timestamp() const {
+  return _impl_.timestamp_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 AppStateFatalExceptionNotification::timestamp() const {
+inline int64_t AppStateFatalExceptionNotification::timestamp() const {
   // @@protoc_insertion_point(field_get:proto.AppStateFatalExceptionNotification.timestamp)
   return _internal_timestamp();
 }
-inline void AppStateFatalExceptionNotification::_internal_set_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value) {
-  _has_bits_[0] |= 0x00000001u;
-  timestamp_ = value;
+inline void AppStateFatalExceptionNotification::_internal_set_timestamp(int64_t value) {
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.timestamp_ = value;
 }
-inline void AppStateFatalExceptionNotification::set_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value) {
+inline void AppStateFatalExceptionNotification::set_timestamp(int64_t value) {
   _internal_set_timestamp(value);
   // @@protoc_insertion_point(field_set:proto.AppStateFatalExceptionNotification.timestamp)
 }
@@ -34389,26 +35845,26 @@ inline void AppStateFatalExceptionNotification::set_timestamp(::PROTOBUF_NAMESPA
 
 // optional bool securityNotificationEnabled = 1;
 inline bool InitialSecurityNotificationSettingSync::_internal_has_securitynotificationenabled() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool InitialSecurityNotificationSettingSync::has_securitynotificationenabled() const {
   return _internal_has_securitynotificationenabled();
 }
 inline void InitialSecurityNotificationSettingSync::clear_securitynotificationenabled() {
-  securitynotificationenabled_ = false;
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.securitynotificationenabled_ = false;
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline bool InitialSecurityNotificationSettingSync::_internal_securitynotificationenabled() const {
-  return securitynotificationenabled_;
+  return _impl_.securitynotificationenabled_;
 }
 inline bool InitialSecurityNotificationSettingSync::securitynotificationenabled() const {
   // @@protoc_insertion_point(field_get:proto.InitialSecurityNotificationSettingSync.securityNotificationEnabled)
   return _internal_securitynotificationenabled();
 }
 inline void InitialSecurityNotificationSettingSync::_internal_set_securitynotificationenabled(bool value) {
-  _has_bits_[0] |= 0x00000001u;
-  securitynotificationenabled_ = value;
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.securitynotificationenabled_ = value;
 }
 inline void InitialSecurityNotificationSettingSync::set_securitynotificationenabled(bool value) {
   _internal_set_securitynotificationenabled(value);
@@ -34421,15 +35877,15 @@ inline void InitialSecurityNotificationSettingSync::set_securitynotificationenab
 
 // optional string displayName = 1;
 inline bool ContactsArrayMessage::_internal_has_displayname() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool ContactsArrayMessage::has_displayname() const {
   return _internal_has_displayname();
 }
 inline void ContactsArrayMessage::clear_displayname() {
-  displayname_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.displayname_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& ContactsArrayMessage::displayname() const {
   // @@protoc_insertion_point(field_get:proto.ContactsArrayMessage.displayName)
@@ -34438,8 +35894,8 @@ inline const std::string& ContactsArrayMessage::displayname() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ContactsArrayMessage::set_displayname(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- displayname_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.displayname_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ContactsArrayMessage.displayName)
 }
 inline std::string* ContactsArrayMessage::mutable_displayname() {
@@ -34448,63 +35904,73 @@ inline std::string* ContactsArrayMessage::mutable_displayname() {
   return _s;
 }
 inline const std::string& ContactsArrayMessage::_internal_displayname() const {
-  return displayname_.Get();
+  return _impl_.displayname_.Get();
 }
 inline void ContactsArrayMessage::_internal_set_displayname(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  displayname_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.displayname_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ContactsArrayMessage::_internal_mutable_displayname() {
-  _has_bits_[0] |= 0x00000001u;
-  return displayname_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.displayname_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ContactsArrayMessage::release_displayname() {
   // @@protoc_insertion_point(field_release:proto.ContactsArrayMessage.displayName)
   if (!_internal_has_displayname()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return displayname_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.displayname_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.displayname_.IsDefault()) {
+    _impl_.displayname_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ContactsArrayMessage::set_allocated_displayname(std::string* displayname) {
   if (displayname != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  displayname_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), displayname,
-      GetArenaForAllocation());
+  _impl_.displayname_.SetAllocated(displayname, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.displayname_.IsDefault()) {
+    _impl_.displayname_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ContactsArrayMessage.displayName)
 }
 
 // repeated .proto.ContactMessage contacts = 2;
 inline int ContactsArrayMessage::_internal_contacts_size() const {
-  return contacts_.size();
+  return _impl_.contacts_.size();
 }
 inline int ContactsArrayMessage::contacts_size() const {
   return _internal_contacts_size();
 }
 inline void ContactsArrayMessage::clear_contacts() {
-  contacts_.Clear();
+  _impl_.contacts_.Clear();
 }
 inline ::proto::ContactMessage* ContactsArrayMessage::mutable_contacts(int index) {
   // @@protoc_insertion_point(field_mutable:proto.ContactsArrayMessage.contacts)
-  return contacts_.Mutable(index);
+  return _impl_.contacts_.Mutable(index);
 }
 inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::ContactMessage >*
 ContactsArrayMessage::mutable_contacts() {
   // @@protoc_insertion_point(field_mutable_list:proto.ContactsArrayMessage.contacts)
-  return &contacts_;
+  return &_impl_.contacts_;
 }
 inline const ::proto::ContactMessage& ContactsArrayMessage::_internal_contacts(int index) const {
-  return contacts_.Get(index);
+  return _impl_.contacts_.Get(index);
 }
 inline const ::proto::ContactMessage& ContactsArrayMessage::contacts(int index) const {
   // @@protoc_insertion_point(field_get:proto.ContactsArrayMessage.contacts)
   return _internal_contacts(index);
 }
 inline ::proto::ContactMessage* ContactsArrayMessage::_internal_add_contacts() {
-  return contacts_.Add();
+  return _impl_.contacts_.Add();
 }
 inline ::proto::ContactMessage* ContactsArrayMessage::add_contacts() {
   ::proto::ContactMessage* _add = _internal_add_contacts();
@@ -34514,24 +35980,24 @@ inline ::proto::ContactMessage* ContactsArrayMessage::add_contacts() {
 inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::ContactMessage >&
 ContactsArrayMessage::contacts() const {
   // @@protoc_insertion_point(field_list:proto.ContactsArrayMessage.contacts)
-  return contacts_;
+  return _impl_.contacts_;
 }
 
 // optional .proto.ContextInfo contextInfo = 17;
 inline bool ContactsArrayMessage::_internal_has_contextinfo() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || contextinfo_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.contextinfo_ != nullptr);
   return value;
 }
 inline bool ContactsArrayMessage::has_contextinfo() const {
   return _internal_has_contextinfo();
 }
 inline void ContactsArrayMessage::clear_contextinfo() {
-  if (contextinfo_ != nullptr) contextinfo_->Clear();
-  _has_bits_[0] &= ~0x00000002u;
+  if (_impl_.contextinfo_ != nullptr) _impl_.contextinfo_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const ::proto::ContextInfo& ContactsArrayMessage::_internal_contextinfo() const {
-  const ::proto::ContextInfo* p = contextinfo_;
+  const ::proto::ContextInfo* p = _impl_.contextinfo_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ContextInfo&>(
       ::proto::_ContextInfo_default_instance_);
 }
@@ -34542,20 +36008,20 @@ inline const ::proto::ContextInfo& ContactsArrayMessage::contextinfo() const {
 inline void ContactsArrayMessage::unsafe_arena_set_allocated_contextinfo(
     ::proto::ContextInfo* contextinfo) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(contextinfo_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.contextinfo_);
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   if (contextinfo) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.ContactsArrayMessage.contextInfo)
 }
 inline ::proto::ContextInfo* ContactsArrayMessage::release_contextinfo() {
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -34569,18 +36035,18 @@ inline ::proto::ContextInfo* ContactsArrayMessage::release_contextinfo() {
 }
 inline ::proto::ContextInfo* ContactsArrayMessage::unsafe_arena_release_contextinfo() {
   // @@protoc_insertion_point(field_release:proto.ContactsArrayMessage.contextInfo)
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
   return temp;
 }
 inline ::proto::ContextInfo* ContactsArrayMessage::_internal_mutable_contextinfo() {
-  _has_bits_[0] |= 0x00000002u;
-  if (contextinfo_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000002u;
+  if (_impl_.contextinfo_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ContextInfo>(GetArenaForAllocation());
-    contextinfo_ = p;
+    _impl_.contextinfo_ = p;
   }
-  return contextinfo_;
+  return _impl_.contextinfo_;
 }
 inline ::proto::ContextInfo* ContactsArrayMessage::mutable_contextinfo() {
   ::proto::ContextInfo* _msg = _internal_mutable_contextinfo();
@@ -34590,20 +36056,20 @@ inline ::proto::ContextInfo* ContactsArrayMessage::mutable_contextinfo() {
 inline void ContactsArrayMessage::set_allocated_contextinfo(::proto::ContextInfo* contextinfo) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete contextinfo_;
+    delete _impl_.contextinfo_;
   }
   if (contextinfo) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ContextInfo>::GetOwningArena(contextinfo);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(contextinfo);
     if (message_arena != submessage_arena) {
       contextinfo = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, contextinfo, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   // @@protoc_insertion_point(field_set_allocated:proto.ContactsArrayMessage.contextInfo)
 }
 
@@ -34613,15 +36079,15 @@ inline void ContactsArrayMessage::set_allocated_contextinfo(::proto::ContextInfo
 
 // optional string currencyCode = 1;
 inline bool HSMCurrency::_internal_has_currencycode() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool HSMCurrency::has_currencycode() const {
   return _internal_has_currencycode();
 }
 inline void HSMCurrency::clear_currencycode() {
-  currencycode_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.currencycode_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& HSMCurrency::currencycode() const {
   // @@protoc_insertion_point(field_get:proto.HSMCurrency.currencyCode)
@@ -34630,8 +36096,8 @@ inline const std::string& HSMCurrency::currencycode() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void HSMCurrency::set_currencycode(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- currencycode_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.currencycode_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.HSMCurrency.currencyCode)
 }
 inline std::string* HSMCurrency::mutable_currencycode() {
@@ -34640,59 +36106,69 @@ inline std::string* HSMCurrency::mutable_currencycode() {
   return _s;
 }
 inline const std::string& HSMCurrency::_internal_currencycode() const {
-  return currencycode_.Get();
+  return _impl_.currencycode_.Get();
 }
 inline void HSMCurrency::_internal_set_currencycode(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  currencycode_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.currencycode_.Set(value, GetArenaForAllocation());
 }
 inline std::string* HSMCurrency::_internal_mutable_currencycode() {
-  _has_bits_[0] |= 0x00000001u;
-  return currencycode_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.currencycode_.Mutable(GetArenaForAllocation());
 }
 inline std::string* HSMCurrency::release_currencycode() {
   // @@protoc_insertion_point(field_release:proto.HSMCurrency.currencyCode)
   if (!_internal_has_currencycode()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return currencycode_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.currencycode_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.currencycode_.IsDefault()) {
+    _impl_.currencycode_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void HSMCurrency::set_allocated_currencycode(std::string* currencycode) {
   if (currencycode != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  currencycode_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), currencycode,
-      GetArenaForAllocation());
+  _impl_.currencycode_.SetAllocated(currencycode, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.currencycode_.IsDefault()) {
+    _impl_.currencycode_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.HSMCurrency.currencyCode)
 }
 
 // optional int64 amount1000 = 2;
 inline bool HSMCurrency::_internal_has_amount1000() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool HSMCurrency::has_amount1000() const {
   return _internal_has_amount1000();
 }
 inline void HSMCurrency::clear_amount1000() {
-  amount1000_ = int64_t{0};
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.amount1000_ = int64_t{0};
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 HSMCurrency::_internal_amount1000() const {
-  return amount1000_;
+inline int64_t HSMCurrency::_internal_amount1000() const {
+  return _impl_.amount1000_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 HSMCurrency::amount1000() const {
+inline int64_t HSMCurrency::amount1000() const {
   // @@protoc_insertion_point(field_get:proto.HSMCurrency.amount1000)
   return _internal_amount1000();
 }
-inline void HSMCurrency::_internal_set_amount1000(::PROTOBUF_NAMESPACE_ID::int64 value) {
-  _has_bits_[0] |= 0x00000002u;
-  amount1000_ = value;
+inline void HSMCurrency::_internal_set_amount1000(int64_t value) {
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.amount1000_ = value;
 }
-inline void HSMCurrency::set_amount1000(::PROTOBUF_NAMESPACE_ID::int64 value) {
+inline void HSMCurrency::set_amount1000(int64_t value) {
   _internal_set_amount1000(value);
   // @@protoc_insertion_point(field_set:proto.HSMCurrency.amount1000)
 }
@@ -34703,18 +36179,18 @@ inline void HSMCurrency::set_amount1000(::PROTOBUF_NAMESPACE_ID::int64 value) {
 
 // optional .proto.HSMDateTimeComponent.HSMDateTimeComponentDayOfWeekType dayOfWeek = 1;
 inline bool HSMDateTimeComponent::_internal_has_dayofweek() const {
-  bool value = (_has_bits_[0] & 0x00000020u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
   return value;
 }
 inline bool HSMDateTimeComponent::has_dayofweek() const {
   return _internal_has_dayofweek();
 }
 inline void HSMDateTimeComponent::clear_dayofweek() {
-  dayofweek_ = 1;
-  _has_bits_[0] &= ~0x00000020u;
+  _impl_.dayofweek_ = 1;
+  _impl_._has_bits_[0] &= ~0x00000020u;
 }
 inline ::proto::HSMDateTimeComponent_HSMDateTimeComponentDayOfWeekType HSMDateTimeComponent::_internal_dayofweek() const {
-  return static_cast< ::proto::HSMDateTimeComponent_HSMDateTimeComponentDayOfWeekType >(dayofweek_);
+  return static_cast< ::proto::HSMDateTimeComponent_HSMDateTimeComponentDayOfWeekType >(_impl_.dayofweek_);
 }
 inline ::proto::HSMDateTimeComponent_HSMDateTimeComponentDayOfWeekType HSMDateTimeComponent::dayofweek() const {
   // @@protoc_insertion_point(field_get:proto.HSMDateTimeComponent.dayOfWeek)
@@ -34722,8 +36198,8 @@ inline ::proto::HSMDateTimeComponent_HSMDateTimeComponentDayOfWeekType HSMDateTi
 }
 inline void HSMDateTimeComponent::_internal_set_dayofweek(::proto::HSMDateTimeComponent_HSMDateTimeComponentDayOfWeekType value) {
   assert(::proto::HSMDateTimeComponent_HSMDateTimeComponentDayOfWeekType_IsValid(value));
-  _has_bits_[0] |= 0x00000020u;
-  dayofweek_ = value;
+  _impl_._has_bits_[0] |= 0x00000020u;
+  _impl_.dayofweek_ = value;
 }
 inline void HSMDateTimeComponent::set_dayofweek(::proto::HSMDateTimeComponent_HSMDateTimeComponentDayOfWeekType value) {
   _internal_set_dayofweek(value);
@@ -34732,158 +36208,158 @@ inline void HSMDateTimeComponent::set_dayofweek(::proto::HSMDateTimeComponent_HS
 
 // optional uint32 year = 2;
 inline bool HSMDateTimeComponent::_internal_has_year() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool HSMDateTimeComponent::has_year() const {
   return _internal_has_year();
 }
 inline void HSMDateTimeComponent::clear_year() {
-  year_ = 0u;
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.year_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 HSMDateTimeComponent::_internal_year() const {
-  return year_;
+inline uint32_t HSMDateTimeComponent::_internal_year() const {
+  return _impl_.year_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 HSMDateTimeComponent::year() const {
+inline uint32_t HSMDateTimeComponent::year() const {
   // @@protoc_insertion_point(field_get:proto.HSMDateTimeComponent.year)
   return _internal_year();
 }
-inline void HSMDateTimeComponent::_internal_set_year(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000001u;
-  year_ = value;
+inline void HSMDateTimeComponent::_internal_set_year(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.year_ = value;
 }
-inline void HSMDateTimeComponent::set_year(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void HSMDateTimeComponent::set_year(uint32_t value) {
   _internal_set_year(value);
   // @@protoc_insertion_point(field_set:proto.HSMDateTimeComponent.year)
 }
 
 // optional uint32 month = 3;
 inline bool HSMDateTimeComponent::_internal_has_month() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool HSMDateTimeComponent::has_month() const {
   return _internal_has_month();
 }
 inline void HSMDateTimeComponent::clear_month() {
-  month_ = 0u;
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.month_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 HSMDateTimeComponent::_internal_month() const {
-  return month_;
+inline uint32_t HSMDateTimeComponent::_internal_month() const {
+  return _impl_.month_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 HSMDateTimeComponent::month() const {
+inline uint32_t HSMDateTimeComponent::month() const {
   // @@protoc_insertion_point(field_get:proto.HSMDateTimeComponent.month)
   return _internal_month();
 }
-inline void HSMDateTimeComponent::_internal_set_month(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000002u;
-  month_ = value;
+inline void HSMDateTimeComponent::_internal_set_month(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.month_ = value;
 }
-inline void HSMDateTimeComponent::set_month(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void HSMDateTimeComponent::set_month(uint32_t value) {
   _internal_set_month(value);
   // @@protoc_insertion_point(field_set:proto.HSMDateTimeComponent.month)
 }
 
 // optional uint32 dayOfMonth = 4;
 inline bool HSMDateTimeComponent::_internal_has_dayofmonth() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool HSMDateTimeComponent::has_dayofmonth() const {
   return _internal_has_dayofmonth();
 }
 inline void HSMDateTimeComponent::clear_dayofmonth() {
-  dayofmonth_ = 0u;
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.dayofmonth_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 HSMDateTimeComponent::_internal_dayofmonth() const {
-  return dayofmonth_;
+inline uint32_t HSMDateTimeComponent::_internal_dayofmonth() const {
+  return _impl_.dayofmonth_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 HSMDateTimeComponent::dayofmonth() const {
+inline uint32_t HSMDateTimeComponent::dayofmonth() const {
   // @@protoc_insertion_point(field_get:proto.HSMDateTimeComponent.dayOfMonth)
   return _internal_dayofmonth();
 }
-inline void HSMDateTimeComponent::_internal_set_dayofmonth(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000004u;
-  dayofmonth_ = value;
+inline void HSMDateTimeComponent::_internal_set_dayofmonth(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.dayofmonth_ = value;
 }
-inline void HSMDateTimeComponent::set_dayofmonth(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void HSMDateTimeComponent::set_dayofmonth(uint32_t value) {
   _internal_set_dayofmonth(value);
   // @@protoc_insertion_point(field_set:proto.HSMDateTimeComponent.dayOfMonth)
 }
 
 // optional uint32 hour = 5;
 inline bool HSMDateTimeComponent::_internal_has_hour() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool HSMDateTimeComponent::has_hour() const {
   return _internal_has_hour();
 }
 inline void HSMDateTimeComponent::clear_hour() {
-  hour_ = 0u;
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.hour_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 HSMDateTimeComponent::_internal_hour() const {
-  return hour_;
+inline uint32_t HSMDateTimeComponent::_internal_hour() const {
+  return _impl_.hour_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 HSMDateTimeComponent::hour() const {
+inline uint32_t HSMDateTimeComponent::hour() const {
   // @@protoc_insertion_point(field_get:proto.HSMDateTimeComponent.hour)
   return _internal_hour();
 }
-inline void HSMDateTimeComponent::_internal_set_hour(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000008u;
-  hour_ = value;
+inline void HSMDateTimeComponent::_internal_set_hour(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.hour_ = value;
 }
-inline void HSMDateTimeComponent::set_hour(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void HSMDateTimeComponent::set_hour(uint32_t value) {
   _internal_set_hour(value);
   // @@protoc_insertion_point(field_set:proto.HSMDateTimeComponent.hour)
 }
 
 // optional uint32 minute = 6;
 inline bool HSMDateTimeComponent::_internal_has_minute() const {
-  bool value = (_has_bits_[0] & 0x00000010u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
   return value;
 }
 inline bool HSMDateTimeComponent::has_minute() const {
   return _internal_has_minute();
 }
 inline void HSMDateTimeComponent::clear_minute() {
-  minute_ = 0u;
-  _has_bits_[0] &= ~0x00000010u;
+  _impl_.minute_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000010u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 HSMDateTimeComponent::_internal_minute() const {
-  return minute_;
+inline uint32_t HSMDateTimeComponent::_internal_minute() const {
+  return _impl_.minute_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 HSMDateTimeComponent::minute() const {
+inline uint32_t HSMDateTimeComponent::minute() const {
   // @@protoc_insertion_point(field_get:proto.HSMDateTimeComponent.minute)
   return _internal_minute();
 }
-inline void HSMDateTimeComponent::_internal_set_minute(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000010u;
-  minute_ = value;
+inline void HSMDateTimeComponent::_internal_set_minute(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000010u;
+  _impl_.minute_ = value;
 }
-inline void HSMDateTimeComponent::set_minute(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void HSMDateTimeComponent::set_minute(uint32_t value) {
   _internal_set_minute(value);
   // @@protoc_insertion_point(field_set:proto.HSMDateTimeComponent.minute)
 }
 
 // optional .proto.HSMDateTimeComponent.HSMDateTimeComponentCalendarType calendar = 7;
 inline bool HSMDateTimeComponent::_internal_has_calendar() const {
-  bool value = (_has_bits_[0] & 0x00000040u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
   return value;
 }
 inline bool HSMDateTimeComponent::has_calendar() const {
   return _internal_has_calendar();
 }
 inline void HSMDateTimeComponent::clear_calendar() {
-  calendar_ = 1;
-  _has_bits_[0] &= ~0x00000040u;
+  _impl_.calendar_ = 1;
+  _impl_._has_bits_[0] &= ~0x00000040u;
 }
 inline ::proto::HSMDateTimeComponent_HSMDateTimeComponentCalendarType HSMDateTimeComponent::_internal_calendar() const {
-  return static_cast< ::proto::HSMDateTimeComponent_HSMDateTimeComponentCalendarType >(calendar_);
+  return static_cast< ::proto::HSMDateTimeComponent_HSMDateTimeComponentCalendarType >(_impl_.calendar_);
 }
 inline ::proto::HSMDateTimeComponent_HSMDateTimeComponentCalendarType HSMDateTimeComponent::calendar() const {
   // @@protoc_insertion_point(field_get:proto.HSMDateTimeComponent.calendar)
@@ -34891,8 +36367,8 @@ inline ::proto::HSMDateTimeComponent_HSMDateTimeComponentCalendarType HSMDateTim
 }
 inline void HSMDateTimeComponent::_internal_set_calendar(::proto::HSMDateTimeComponent_HSMDateTimeComponentCalendarType value) {
   assert(::proto::HSMDateTimeComponent_HSMDateTimeComponentCalendarType_IsValid(value));
-  _has_bits_[0] |= 0x00000040u;
-  calendar_ = value;
+  _impl_._has_bits_[0] |= 0x00000040u;
+  _impl_.calendar_ = value;
 }
 inline void HSMDateTimeComponent::set_calendar(::proto::HSMDateTimeComponent_HSMDateTimeComponentCalendarType value) {
   _internal_set_calendar(value);
@@ -34905,28 +36381,28 @@ inline void HSMDateTimeComponent::set_calendar(::proto::HSMDateTimeComponent_HSM
 
 // optional int64 timestamp = 1;
 inline bool HSMDateTimeUnixEpoch::_internal_has_timestamp() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool HSMDateTimeUnixEpoch::has_timestamp() const {
   return _internal_has_timestamp();
 }
 inline void HSMDateTimeUnixEpoch::clear_timestamp() {
-  timestamp_ = int64_t{0};
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.timestamp_ = int64_t{0};
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 HSMDateTimeUnixEpoch::_internal_timestamp() const {
-  return timestamp_;
+inline int64_t HSMDateTimeUnixEpoch::_internal_timestamp() const {
+  return _impl_.timestamp_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 HSMDateTimeUnixEpoch::timestamp() const {
+inline int64_t HSMDateTimeUnixEpoch::timestamp() const {
   // @@protoc_insertion_point(field_get:proto.HSMDateTimeUnixEpoch.timestamp)
   return _internal_timestamp();
 }
-inline void HSMDateTimeUnixEpoch::_internal_set_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value) {
-  _has_bits_[0] |= 0x00000001u;
-  timestamp_ = value;
+inline void HSMDateTimeUnixEpoch::_internal_set_timestamp(int64_t value) {
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.timestamp_ = value;
 }
-inline void HSMDateTimeUnixEpoch::set_timestamp(::PROTOBUF_NAMESPACE_ID::int64 value) {
+inline void HSMDateTimeUnixEpoch::set_timestamp(int64_t value) {
   _internal_set_timestamp(value);
   // @@protoc_insertion_point(field_set:proto.HSMDateTimeUnixEpoch.timestamp)
 }
@@ -34943,12 +36419,12 @@ inline bool HSMDateTime::has_component() const {
   return _internal_has_component();
 }
 inline void HSMDateTime::set_has_component() {
-  _oneof_case_[0] = kComponent;
+  _impl_._oneof_case_[0] = kComponent;
 }
 inline void HSMDateTime::clear_component() {
   if (_internal_has_component()) {
     if (GetArenaForAllocation() == nullptr) {
-      delete datetimeOneof_.component_;
+      delete _impl_.datetimeOneof_.component_;
     }
     clear_has_datetimeOneof();
   }
@@ -34957,11 +36433,11 @@ inline ::proto::HSMDateTimeComponent* HSMDateTime::release_component() {
   // @@protoc_insertion_point(field_release:proto.HSMDateTime.component)
   if (_internal_has_component()) {
     clear_has_datetimeOneof();
-      ::proto::HSMDateTimeComponent* temp = datetimeOneof_.component_;
+    ::proto::HSMDateTimeComponent* temp = _impl_.datetimeOneof_.component_;
     if (GetArenaForAllocation() != nullptr) {
       temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
     }
-    datetimeOneof_.component_ = nullptr;
+    _impl_.datetimeOneof_.component_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -34969,7 +36445,7 @@ inline ::proto::HSMDateTimeComponent* HSMDateTime::release_component() {
 }
 inline const ::proto::HSMDateTimeComponent& HSMDateTime::_internal_component() const {
   return _internal_has_component()
-      ? *datetimeOneof_.component_
+      ? *_impl_.datetimeOneof_.component_
       : reinterpret_cast< ::proto::HSMDateTimeComponent&>(::proto::_HSMDateTimeComponent_default_instance_);
 }
 inline const ::proto::HSMDateTimeComponent& HSMDateTime::component() const {
@@ -34980,8 +36456,8 @@ inline ::proto::HSMDateTimeComponent* HSMDateTime::unsafe_arena_release_componen
   // @@protoc_insertion_point(field_unsafe_arena_release:proto.HSMDateTime.component)
   if (_internal_has_component()) {
     clear_has_datetimeOneof();
-    ::proto::HSMDateTimeComponent* temp = datetimeOneof_.component_;
-    datetimeOneof_.component_ = nullptr;
+    ::proto::HSMDateTimeComponent* temp = _impl_.datetimeOneof_.component_;
+    _impl_.datetimeOneof_.component_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -34991,7 +36467,7 @@ inline void HSMDateTime::unsafe_arena_set_allocated_component(::proto::HSMDateTi
   clear_datetimeOneof();
   if (component) {
     set_has_component();
-    datetimeOneof_.component_ = component;
+    _impl_.datetimeOneof_.component_ = component;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.HSMDateTime.component)
 }
@@ -34999,9 +36475,9 @@ inline ::proto::HSMDateTimeComponent* HSMDateTime::_internal_mutable_component()
   if (!_internal_has_component()) {
     clear_datetimeOneof();
     set_has_component();
-    datetimeOneof_.component_ = CreateMaybeMessage< ::proto::HSMDateTimeComponent >(GetArenaForAllocation());
+    _impl_.datetimeOneof_.component_ = CreateMaybeMessage< ::proto::HSMDateTimeComponent >(GetArenaForAllocation());
   }
-  return datetimeOneof_.component_;
+  return _impl_.datetimeOneof_.component_;
 }
 inline ::proto::HSMDateTimeComponent* HSMDateTime::mutable_component() {
   ::proto::HSMDateTimeComponent* _msg = _internal_mutable_component();
@@ -35017,12 +36493,12 @@ inline bool HSMDateTime::has_unixepoch() const {
   return _internal_has_unixepoch();
 }
 inline void HSMDateTime::set_has_unixepoch() {
-  _oneof_case_[0] = kUnixEpoch;
+  _impl_._oneof_case_[0] = kUnixEpoch;
 }
 inline void HSMDateTime::clear_unixepoch() {
   if (_internal_has_unixepoch()) {
     if (GetArenaForAllocation() == nullptr) {
-      delete datetimeOneof_.unixepoch_;
+      delete _impl_.datetimeOneof_.unixepoch_;
     }
     clear_has_datetimeOneof();
   }
@@ -35031,11 +36507,11 @@ inline ::proto::HSMDateTimeUnixEpoch* HSMDateTime::release_unixepoch() {
   // @@protoc_insertion_point(field_release:proto.HSMDateTime.unixEpoch)
   if (_internal_has_unixepoch()) {
     clear_has_datetimeOneof();
-      ::proto::HSMDateTimeUnixEpoch* temp = datetimeOneof_.unixepoch_;
+    ::proto::HSMDateTimeUnixEpoch* temp = _impl_.datetimeOneof_.unixepoch_;
     if (GetArenaForAllocation() != nullptr) {
       temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
     }
-    datetimeOneof_.unixepoch_ = nullptr;
+    _impl_.datetimeOneof_.unixepoch_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -35043,7 +36519,7 @@ inline ::proto::HSMDateTimeUnixEpoch* HSMDateTime::release_unixepoch() {
 }
 inline const ::proto::HSMDateTimeUnixEpoch& HSMDateTime::_internal_unixepoch() const {
   return _internal_has_unixepoch()
-      ? *datetimeOneof_.unixepoch_
+      ? *_impl_.datetimeOneof_.unixepoch_
       : reinterpret_cast< ::proto::HSMDateTimeUnixEpoch&>(::proto::_HSMDateTimeUnixEpoch_default_instance_);
 }
 inline const ::proto::HSMDateTimeUnixEpoch& HSMDateTime::unixepoch() const {
@@ -35054,8 +36530,8 @@ inline ::proto::HSMDateTimeUnixEpoch* HSMDateTime::unsafe_arena_release_unixepoc
   // @@protoc_insertion_point(field_unsafe_arena_release:proto.HSMDateTime.unixEpoch)
   if (_internal_has_unixepoch()) {
     clear_has_datetimeOneof();
-    ::proto::HSMDateTimeUnixEpoch* temp = datetimeOneof_.unixepoch_;
-    datetimeOneof_.unixepoch_ = nullptr;
+    ::proto::HSMDateTimeUnixEpoch* temp = _impl_.datetimeOneof_.unixepoch_;
+    _impl_.datetimeOneof_.unixepoch_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -35065,7 +36541,7 @@ inline void HSMDateTime::unsafe_arena_set_allocated_unixepoch(::proto::HSMDateTi
   clear_datetimeOneof();
   if (unixepoch) {
     set_has_unixepoch();
-    datetimeOneof_.unixepoch_ = unixepoch;
+    _impl_.datetimeOneof_.unixepoch_ = unixepoch;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.HSMDateTime.unixEpoch)
 }
@@ -35073,9 +36549,9 @@ inline ::proto::HSMDateTimeUnixEpoch* HSMDateTime::_internal_mutable_unixepoch()
   if (!_internal_has_unixepoch()) {
     clear_datetimeOneof();
     set_has_unixepoch();
-    datetimeOneof_.unixepoch_ = CreateMaybeMessage< ::proto::HSMDateTimeUnixEpoch >(GetArenaForAllocation());
+    _impl_.datetimeOneof_.unixepoch_ = CreateMaybeMessage< ::proto::HSMDateTimeUnixEpoch >(GetArenaForAllocation());
   }
-  return datetimeOneof_.unixepoch_;
+  return _impl_.datetimeOneof_.unixepoch_;
 }
 inline ::proto::HSMDateTimeUnixEpoch* HSMDateTime::mutable_unixepoch() {
   ::proto::HSMDateTimeUnixEpoch* _msg = _internal_mutable_unixepoch();
@@ -35087,10 +36563,10 @@ inline bool HSMDateTime::has_datetimeOneof() const {
   return datetimeOneof_case() != DATETIMEONEOF_NOT_SET;
 }
 inline void HSMDateTime::clear_has_datetimeOneof() {
-  _oneof_case_[0] = DATETIMEONEOF_NOT_SET;
+  _impl_._oneof_case_[0] = DATETIMEONEOF_NOT_SET;
 }
 inline HSMDateTime::DatetimeOneofCase HSMDateTime::datetimeOneof_case() const {
-  return HSMDateTime::DatetimeOneofCase(_oneof_case_[0]);
+  return HSMDateTime::DatetimeOneofCase(_impl_._oneof_case_[0]);
 }
 // -------------------------------------------------------------------
 
@@ -35098,15 +36574,15 @@ inline HSMDateTime::DatetimeOneofCase HSMDateTime::datetimeOneof_case() const {
 
 // optional string default = 1;
 inline bool HSMLocalizableParameter::_internal_has_default_() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool HSMLocalizableParameter::has_default_() const {
   return _internal_has_default_();
 }
 inline void HSMLocalizableParameter::clear_default_() {
-  default__.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.default__.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& HSMLocalizableParameter::default_() const {
   // @@protoc_insertion_point(field_get:proto.HSMLocalizableParameter.default)
@@ -35115,8 +36591,8 @@ inline const std::string& HSMLocalizableParameter::default_() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void HSMLocalizableParameter::set_default_(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- default__.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.default__.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.HSMLocalizableParameter.default)
 }
 inline std::string* HSMLocalizableParameter::mutable_default_() {
@@ -35125,32 +36601,42 @@ inline std::string* HSMLocalizableParameter::mutable_default_() {
   return _s;
 }
 inline const std::string& HSMLocalizableParameter::_internal_default_() const {
-  return default__.Get();
+  return _impl_.default__.Get();
 }
 inline void HSMLocalizableParameter::_internal_set_default_(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  default__.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.default__.Set(value, GetArenaForAllocation());
 }
 inline std::string* HSMLocalizableParameter::_internal_mutable_default_() {
-  _has_bits_[0] |= 0x00000001u;
-  return default__.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.default__.Mutable(GetArenaForAllocation());
 }
 inline std::string* HSMLocalizableParameter::release_default_() {
   // @@protoc_insertion_point(field_release:proto.HSMLocalizableParameter.default)
   if (!_internal_has_default_()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return default__.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.default__.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.default__.IsDefault()) {
+    _impl_.default__.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void HSMLocalizableParameter::set_allocated_default_(std::string* default_) {
   if (default_ != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  default__.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), default_,
-      GetArenaForAllocation());
+  _impl_.default__.SetAllocated(default_, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.default__.IsDefault()) {
+    _impl_.default__.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.HSMLocalizableParameter.default)
 }
 
@@ -35162,12 +36648,12 @@ inline bool HSMLocalizableParameter::has_currency() const {
   return _internal_has_currency();
 }
 inline void HSMLocalizableParameter::set_has_currency() {
-  _oneof_case_[0] = kCurrency;
+  _impl_._oneof_case_[0] = kCurrency;
 }
 inline void HSMLocalizableParameter::clear_currency() {
   if (_internal_has_currency()) {
     if (GetArenaForAllocation() == nullptr) {
-      delete paramOneof_.currency_;
+      delete _impl_.paramOneof_.currency_;
     }
     clear_has_paramOneof();
   }
@@ -35176,11 +36662,11 @@ inline ::proto::HSMCurrency* HSMLocalizableParameter::release_currency() {
   // @@protoc_insertion_point(field_release:proto.HSMLocalizableParameter.currency)
   if (_internal_has_currency()) {
     clear_has_paramOneof();
-      ::proto::HSMCurrency* temp = paramOneof_.currency_;
+    ::proto::HSMCurrency* temp = _impl_.paramOneof_.currency_;
     if (GetArenaForAllocation() != nullptr) {
       temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
     }
-    paramOneof_.currency_ = nullptr;
+    _impl_.paramOneof_.currency_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -35188,7 +36674,7 @@ inline ::proto::HSMCurrency* HSMLocalizableParameter::release_currency() {
 }
 inline const ::proto::HSMCurrency& HSMLocalizableParameter::_internal_currency() const {
   return _internal_has_currency()
-      ? *paramOneof_.currency_
+      ? *_impl_.paramOneof_.currency_
       : reinterpret_cast< ::proto::HSMCurrency&>(::proto::_HSMCurrency_default_instance_);
 }
 inline const ::proto::HSMCurrency& HSMLocalizableParameter::currency() const {
@@ -35199,8 +36685,8 @@ inline ::proto::HSMCurrency* HSMLocalizableParameter::unsafe_arena_release_curre
   // @@protoc_insertion_point(field_unsafe_arena_release:proto.HSMLocalizableParameter.currency)
   if (_internal_has_currency()) {
     clear_has_paramOneof();
-    ::proto::HSMCurrency* temp = paramOneof_.currency_;
-    paramOneof_.currency_ = nullptr;
+    ::proto::HSMCurrency* temp = _impl_.paramOneof_.currency_;
+    _impl_.paramOneof_.currency_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -35210,7 +36696,7 @@ inline void HSMLocalizableParameter::unsafe_arena_set_allocated_currency(::proto
   clear_paramOneof();
   if (currency) {
     set_has_currency();
-    paramOneof_.currency_ = currency;
+    _impl_.paramOneof_.currency_ = currency;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.HSMLocalizableParameter.currency)
 }
@@ -35218,9 +36704,9 @@ inline ::proto::HSMCurrency* HSMLocalizableParameter::_internal_mutable_currency
   if (!_internal_has_currency()) {
     clear_paramOneof();
     set_has_currency();
-    paramOneof_.currency_ = CreateMaybeMessage< ::proto::HSMCurrency >(GetArenaForAllocation());
+    _impl_.paramOneof_.currency_ = CreateMaybeMessage< ::proto::HSMCurrency >(GetArenaForAllocation());
   }
-  return paramOneof_.currency_;
+  return _impl_.paramOneof_.currency_;
 }
 inline ::proto::HSMCurrency* HSMLocalizableParameter::mutable_currency() {
   ::proto::HSMCurrency* _msg = _internal_mutable_currency();
@@ -35236,12 +36722,12 @@ inline bool HSMLocalizableParameter::has_datetime() const {
   return _internal_has_datetime();
 }
 inline void HSMLocalizableParameter::set_has_datetime() {
-  _oneof_case_[0] = kDateTime;
+  _impl_._oneof_case_[0] = kDateTime;
 }
 inline void HSMLocalizableParameter::clear_datetime() {
   if (_internal_has_datetime()) {
     if (GetArenaForAllocation() == nullptr) {
-      delete paramOneof_.datetime_;
+      delete _impl_.paramOneof_.datetime_;
     }
     clear_has_paramOneof();
   }
@@ -35250,11 +36736,11 @@ inline ::proto::HSMDateTime* HSMLocalizableParameter::release_datetime() {
   // @@protoc_insertion_point(field_release:proto.HSMLocalizableParameter.dateTime)
   if (_internal_has_datetime()) {
     clear_has_paramOneof();
-      ::proto::HSMDateTime* temp = paramOneof_.datetime_;
+    ::proto::HSMDateTime* temp = _impl_.paramOneof_.datetime_;
     if (GetArenaForAllocation() != nullptr) {
       temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
     }
-    paramOneof_.datetime_ = nullptr;
+    _impl_.paramOneof_.datetime_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -35262,7 +36748,7 @@ inline ::proto::HSMDateTime* HSMLocalizableParameter::release_datetime() {
 }
 inline const ::proto::HSMDateTime& HSMLocalizableParameter::_internal_datetime() const {
   return _internal_has_datetime()
-      ? *paramOneof_.datetime_
+      ? *_impl_.paramOneof_.datetime_
       : reinterpret_cast< ::proto::HSMDateTime&>(::proto::_HSMDateTime_default_instance_);
 }
 inline const ::proto::HSMDateTime& HSMLocalizableParameter::datetime() const {
@@ -35273,8 +36759,8 @@ inline ::proto::HSMDateTime* HSMLocalizableParameter::unsafe_arena_release_datet
   // @@protoc_insertion_point(field_unsafe_arena_release:proto.HSMLocalizableParameter.dateTime)
   if (_internal_has_datetime()) {
     clear_has_paramOneof();
-    ::proto::HSMDateTime* temp = paramOneof_.datetime_;
-    paramOneof_.datetime_ = nullptr;
+    ::proto::HSMDateTime* temp = _impl_.paramOneof_.datetime_;
+    _impl_.paramOneof_.datetime_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -35284,7 +36770,7 @@ inline void HSMLocalizableParameter::unsafe_arena_set_allocated_datetime(::proto
   clear_paramOneof();
   if (datetime) {
     set_has_datetime();
-    paramOneof_.datetime_ = datetime;
+    _impl_.paramOneof_.datetime_ = datetime;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.HSMLocalizableParameter.dateTime)
 }
@@ -35292,9 +36778,9 @@ inline ::proto::HSMDateTime* HSMLocalizableParameter::_internal_mutable_datetime
   if (!_internal_has_datetime()) {
     clear_paramOneof();
     set_has_datetime();
-    paramOneof_.datetime_ = CreateMaybeMessage< ::proto::HSMDateTime >(GetArenaForAllocation());
+    _impl_.paramOneof_.datetime_ = CreateMaybeMessage< ::proto::HSMDateTime >(GetArenaForAllocation());
   }
-  return paramOneof_.datetime_;
+  return _impl_.paramOneof_.datetime_;
 }
 inline ::proto::HSMDateTime* HSMLocalizableParameter::mutable_datetime() {
   ::proto::HSMDateTime* _msg = _internal_mutable_datetime();
@@ -35306,10 +36792,10 @@ inline bool HSMLocalizableParameter::has_paramOneof() const {
   return paramOneof_case() != PARAMONEOF_NOT_SET;
 }
 inline void HSMLocalizableParameter::clear_has_paramOneof() {
-  _oneof_case_[0] = PARAMONEOF_NOT_SET;
+  _impl_._oneof_case_[0] = PARAMONEOF_NOT_SET;
 }
 inline HSMLocalizableParameter::ParamOneofCase HSMLocalizableParameter::paramOneof_case() const {
-  return HSMLocalizableParameter::ParamOneofCase(_oneof_case_[0]);
+  return HSMLocalizableParameter::ParamOneofCase(_impl_._oneof_case_[0]);
 }
 // -------------------------------------------------------------------
 
@@ -35317,15 +36803,15 @@ inline HSMLocalizableParameter::ParamOneofCase HSMLocalizableParameter::paramOne
 
 // optional string namespace = 1;
 inline bool HighlyStructuredMessage::_internal_has_namespace_() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool HighlyStructuredMessage::has_namespace_() const {
   return _internal_has_namespace_();
 }
 inline void HighlyStructuredMessage::clear_namespace_() {
-  namespace__.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.namespace__.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& HighlyStructuredMessage::namespace_() const {
   // @@protoc_insertion_point(field_get:proto.HighlyStructuredMessage.namespace)
@@ -35334,8 +36820,8 @@ inline const std::string& HighlyStructuredMessage::namespace_() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void HighlyStructuredMessage::set_namespace_(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- namespace__.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.namespace__.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.HighlyStructuredMessage.namespace)
 }
 inline std::string* HighlyStructuredMessage::mutable_namespace_() {
@@ -35344,46 +36830,56 @@ inline std::string* HighlyStructuredMessage::mutable_namespace_() {
   return _s;
 }
 inline const std::string& HighlyStructuredMessage::_internal_namespace_() const {
-  return namespace__.Get();
+  return _impl_.namespace__.Get();
 }
 inline void HighlyStructuredMessage::_internal_set_namespace_(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  namespace__.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.namespace__.Set(value, GetArenaForAllocation());
 }
 inline std::string* HighlyStructuredMessage::_internal_mutable_namespace_() {
-  _has_bits_[0] |= 0x00000001u;
-  return namespace__.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.namespace__.Mutable(GetArenaForAllocation());
 }
 inline std::string* HighlyStructuredMessage::release_namespace_() {
   // @@protoc_insertion_point(field_release:proto.HighlyStructuredMessage.namespace)
   if (!_internal_has_namespace_()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return namespace__.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.namespace__.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.namespace__.IsDefault()) {
+    _impl_.namespace__.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void HighlyStructuredMessage::set_allocated_namespace_(std::string* namespace_) {
   if (namespace_ != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  namespace__.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), namespace_,
-      GetArenaForAllocation());
+  _impl_.namespace__.SetAllocated(namespace_, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.namespace__.IsDefault()) {
+    _impl_.namespace__.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.HighlyStructuredMessage.namespace)
 }
 
 // optional string elementName = 2;
 inline bool HighlyStructuredMessage::_internal_has_elementname() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool HighlyStructuredMessage::has_elementname() const {
   return _internal_has_elementname();
 }
 inline void HighlyStructuredMessage::clear_elementname() {
-  elementname_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.elementname_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& HighlyStructuredMessage::elementname() const {
   // @@protoc_insertion_point(field_get:proto.HighlyStructuredMessage.elementName)
@@ -35392,8 +36888,8 @@ inline const std::string& HighlyStructuredMessage::elementname() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void HighlyStructuredMessage::set_elementname(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- elementname_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.elementname_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.HighlyStructuredMessage.elementName)
 }
 inline std::string* HighlyStructuredMessage::mutable_elementname() {
@@ -35402,44 +36898,54 @@ inline std::string* HighlyStructuredMessage::mutable_elementname() {
   return _s;
 }
 inline const std::string& HighlyStructuredMessage::_internal_elementname() const {
-  return elementname_.Get();
+  return _impl_.elementname_.Get();
 }
 inline void HighlyStructuredMessage::_internal_set_elementname(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  elementname_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.elementname_.Set(value, GetArenaForAllocation());
 }
 inline std::string* HighlyStructuredMessage::_internal_mutable_elementname() {
-  _has_bits_[0] |= 0x00000002u;
-  return elementname_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.elementname_.Mutable(GetArenaForAllocation());
 }
 inline std::string* HighlyStructuredMessage::release_elementname() {
   // @@protoc_insertion_point(field_release:proto.HighlyStructuredMessage.elementName)
   if (!_internal_has_elementname()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return elementname_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.elementname_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.elementname_.IsDefault()) {
+    _impl_.elementname_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void HighlyStructuredMessage::set_allocated_elementname(std::string* elementname) {
   if (elementname != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
+  }
+  _impl_.elementname_.SetAllocated(elementname, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.elementname_.IsDefault()) {
+    _impl_.elementname_.Set("", GetArenaForAllocation());
   }
-  elementname_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), elementname,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.HighlyStructuredMessage.elementName)
 }
 
 // repeated string params = 3;
 inline int HighlyStructuredMessage::_internal_params_size() const {
-  return params_.size();
+  return _impl_.params_.size();
 }
 inline int HighlyStructuredMessage::params_size() const {
   return _internal_params_size();
 }
 inline void HighlyStructuredMessage::clear_params() {
-  params_.Clear();
+  _impl_.params_.Clear();
 }
 inline std::string* HighlyStructuredMessage::add_params() {
   std::string* _s = _internal_add_params();
@@ -35447,7 +36953,7 @@ inline std::string* HighlyStructuredMessage::add_params() {
   return _s;
 }
 inline const std::string& HighlyStructuredMessage::_internal_params(int index) const {
-  return params_.Get(index);
+  return _impl_.params_.Get(index);
 }
 inline const std::string& HighlyStructuredMessage::params(int index) const {
   // @@protoc_insertion_point(field_get:proto.HighlyStructuredMessage.params)
@@ -35455,68 +36961,68 @@ inline const std::string& HighlyStructuredMessage::params(int index) const {
 }
 inline std::string* HighlyStructuredMessage::mutable_params(int index) {
   // @@protoc_insertion_point(field_mutable:proto.HighlyStructuredMessage.params)
-  return params_.Mutable(index);
+  return _impl_.params_.Mutable(index);
 }
 inline void HighlyStructuredMessage::set_params(int index, const std::string& value) {
-  params_.Mutable(index)->assign(value);
+  _impl_.params_.Mutable(index)->assign(value);
   // @@protoc_insertion_point(field_set:proto.HighlyStructuredMessage.params)
 }
 inline void HighlyStructuredMessage::set_params(int index, std::string&& value) {
-  params_.Mutable(index)->assign(std::move(value));
+  _impl_.params_.Mutable(index)->assign(std::move(value));
   // @@protoc_insertion_point(field_set:proto.HighlyStructuredMessage.params)
 }
 inline void HighlyStructuredMessage::set_params(int index, const char* value) {
   GOOGLE_DCHECK(value != nullptr);
-  params_.Mutable(index)->assign(value);
+  _impl_.params_.Mutable(index)->assign(value);
   // @@protoc_insertion_point(field_set_char:proto.HighlyStructuredMessage.params)
 }
 inline void HighlyStructuredMessage::set_params(int index, const char* value, size_t size) {
-  params_.Mutable(index)->assign(
+  _impl_.params_.Mutable(index)->assign(
     reinterpret_cast<const char*>(value), size);
   // @@protoc_insertion_point(field_set_pointer:proto.HighlyStructuredMessage.params)
 }
 inline std::string* HighlyStructuredMessage::_internal_add_params() {
-  return params_.Add();
+  return _impl_.params_.Add();
 }
 inline void HighlyStructuredMessage::add_params(const std::string& value) {
-  params_.Add()->assign(value);
+  _impl_.params_.Add()->assign(value);
   // @@protoc_insertion_point(field_add:proto.HighlyStructuredMessage.params)
 }
 inline void HighlyStructuredMessage::add_params(std::string&& value) {
-  params_.Add(std::move(value));
+  _impl_.params_.Add(std::move(value));
   // @@protoc_insertion_point(field_add:proto.HighlyStructuredMessage.params)
 }
 inline void HighlyStructuredMessage::add_params(const char* value) {
   GOOGLE_DCHECK(value != nullptr);
-  params_.Add()->assign(value);
+  _impl_.params_.Add()->assign(value);
   // @@protoc_insertion_point(field_add_char:proto.HighlyStructuredMessage.params)
 }
 inline void HighlyStructuredMessage::add_params(const char* value, size_t size) {
-  params_.Add()->assign(reinterpret_cast<const char*>(value), size);
+  _impl_.params_.Add()->assign(reinterpret_cast<const char*>(value), size);
   // @@protoc_insertion_point(field_add_pointer:proto.HighlyStructuredMessage.params)
 }
 inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>&
 HighlyStructuredMessage::params() const {
   // @@protoc_insertion_point(field_list:proto.HighlyStructuredMessage.params)
-  return params_;
+  return _impl_.params_;
 }
 inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>*
 HighlyStructuredMessage::mutable_params() {
   // @@protoc_insertion_point(field_mutable_list:proto.HighlyStructuredMessage.params)
-  return &params_;
+  return &_impl_.params_;
 }
 
 // optional string fallbackLg = 4;
 inline bool HighlyStructuredMessage::_internal_has_fallbacklg() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool HighlyStructuredMessage::has_fallbacklg() const {
   return _internal_has_fallbacklg();
 }
 inline void HighlyStructuredMessage::clear_fallbacklg() {
-  fallbacklg_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.fallbacklg_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const std::string& HighlyStructuredMessage::fallbacklg() const {
   // @@protoc_insertion_point(field_get:proto.HighlyStructuredMessage.fallbackLg)
@@ -35525,8 +37031,8 @@ inline const std::string& HighlyStructuredMessage::fallbacklg() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void HighlyStructuredMessage::set_fallbacklg(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000004u;
- fallbacklg_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000004u;
+ _impl_.fallbacklg_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.HighlyStructuredMessage.fallbackLg)
 }
 inline std::string* HighlyStructuredMessage::mutable_fallbacklg() {
@@ -35535,46 +37041,56 @@ inline std::string* HighlyStructuredMessage::mutable_fallbacklg() {
   return _s;
 }
 inline const std::string& HighlyStructuredMessage::_internal_fallbacklg() const {
-  return fallbacklg_.Get();
+  return _impl_.fallbacklg_.Get();
 }
 inline void HighlyStructuredMessage::_internal_set_fallbacklg(const std::string& value) {
-  _has_bits_[0] |= 0x00000004u;
-  fallbacklg_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.fallbacklg_.Set(value, GetArenaForAllocation());
 }
 inline std::string* HighlyStructuredMessage::_internal_mutable_fallbacklg() {
-  _has_bits_[0] |= 0x00000004u;
-  return fallbacklg_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  return _impl_.fallbacklg_.Mutable(GetArenaForAllocation());
 }
 inline std::string* HighlyStructuredMessage::release_fallbacklg() {
   // @@protoc_insertion_point(field_release:proto.HighlyStructuredMessage.fallbackLg)
   if (!_internal_has_fallbacklg()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000004u;
-  return fallbacklg_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  auto* p = _impl_.fallbacklg_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.fallbacklg_.IsDefault()) {
+    _impl_.fallbacklg_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void HighlyStructuredMessage::set_allocated_fallbacklg(std::string* fallbacklg) {
   if (fallbacklg != nullptr) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
+  }
+  _impl_.fallbacklg_.SetAllocated(fallbacklg, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.fallbacklg_.IsDefault()) {
+    _impl_.fallbacklg_.Set("", GetArenaForAllocation());
   }
-  fallbacklg_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), fallbacklg,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.HighlyStructuredMessage.fallbackLg)
 }
 
 // optional string fallbackLc = 5;
 inline bool HighlyStructuredMessage::_internal_has_fallbacklc() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool HighlyStructuredMessage::has_fallbacklc() const {
   return _internal_has_fallbacklc();
 }
 inline void HighlyStructuredMessage::clear_fallbacklc() {
-  fallbacklc_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.fallbacklc_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline const std::string& HighlyStructuredMessage::fallbacklc() const {
   // @@protoc_insertion_point(field_get:proto.HighlyStructuredMessage.fallbackLc)
@@ -35583,8 +37099,8 @@ inline const std::string& HighlyStructuredMessage::fallbacklc() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void HighlyStructuredMessage::set_fallbacklc(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000008u;
- fallbacklc_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000008u;
+ _impl_.fallbacklc_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.HighlyStructuredMessage.fallbackLc)
 }
 inline std::string* HighlyStructuredMessage::mutable_fallbacklc() {
@@ -35593,63 +37109,73 @@ inline std::string* HighlyStructuredMessage::mutable_fallbacklc() {
   return _s;
 }
 inline const std::string& HighlyStructuredMessage::_internal_fallbacklc() const {
-  return fallbacklc_.Get();
+  return _impl_.fallbacklc_.Get();
 }
 inline void HighlyStructuredMessage::_internal_set_fallbacklc(const std::string& value) {
-  _has_bits_[0] |= 0x00000008u;
-  fallbacklc_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.fallbacklc_.Set(value, GetArenaForAllocation());
 }
 inline std::string* HighlyStructuredMessage::_internal_mutable_fallbacklc() {
-  _has_bits_[0] |= 0x00000008u;
-  return fallbacklc_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  return _impl_.fallbacklc_.Mutable(GetArenaForAllocation());
 }
 inline std::string* HighlyStructuredMessage::release_fallbacklc() {
   // @@protoc_insertion_point(field_release:proto.HighlyStructuredMessage.fallbackLc)
   if (!_internal_has_fallbacklc()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000008u;
-  return fallbacklc_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  auto* p = _impl_.fallbacklc_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.fallbacklc_.IsDefault()) {
+    _impl_.fallbacklc_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void HighlyStructuredMessage::set_allocated_fallbacklc(std::string* fallbacklc) {
   if (fallbacklc != nullptr) {
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
+  }
+  _impl_.fallbacklc_.SetAllocated(fallbacklc, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.fallbacklc_.IsDefault()) {
+    _impl_.fallbacklc_.Set("", GetArenaForAllocation());
   }
-  fallbacklc_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), fallbacklc,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.HighlyStructuredMessage.fallbackLc)
 }
 
 // repeated .proto.HSMLocalizableParameter localizableParams = 6;
 inline int HighlyStructuredMessage::_internal_localizableparams_size() const {
-  return localizableparams_.size();
+  return _impl_.localizableparams_.size();
 }
 inline int HighlyStructuredMessage::localizableparams_size() const {
   return _internal_localizableparams_size();
 }
 inline void HighlyStructuredMessage::clear_localizableparams() {
-  localizableparams_.Clear();
+  _impl_.localizableparams_.Clear();
 }
 inline ::proto::HSMLocalizableParameter* HighlyStructuredMessage::mutable_localizableparams(int index) {
   // @@protoc_insertion_point(field_mutable:proto.HighlyStructuredMessage.localizableParams)
-  return localizableparams_.Mutable(index);
+  return _impl_.localizableparams_.Mutable(index);
 }
 inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::HSMLocalizableParameter >*
 HighlyStructuredMessage::mutable_localizableparams() {
   // @@protoc_insertion_point(field_mutable_list:proto.HighlyStructuredMessage.localizableParams)
-  return &localizableparams_;
+  return &_impl_.localizableparams_;
 }
 inline const ::proto::HSMLocalizableParameter& HighlyStructuredMessage::_internal_localizableparams(int index) const {
-  return localizableparams_.Get(index);
+  return _impl_.localizableparams_.Get(index);
 }
 inline const ::proto::HSMLocalizableParameter& HighlyStructuredMessage::localizableparams(int index) const {
   // @@protoc_insertion_point(field_get:proto.HighlyStructuredMessage.localizableParams)
   return _internal_localizableparams(index);
 }
 inline ::proto::HSMLocalizableParameter* HighlyStructuredMessage::_internal_add_localizableparams() {
-  return localizableparams_.Add();
+  return _impl_.localizableparams_.Add();
 }
 inline ::proto::HSMLocalizableParameter* HighlyStructuredMessage::add_localizableparams() {
   ::proto::HSMLocalizableParameter* _add = _internal_add_localizableparams();
@@ -35659,20 +37185,20 @@ inline ::proto::HSMLocalizableParameter* HighlyStructuredMessage::add_localizabl
 inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::HSMLocalizableParameter >&
 HighlyStructuredMessage::localizableparams() const {
   // @@protoc_insertion_point(field_list:proto.HighlyStructuredMessage.localizableParams)
-  return localizableparams_;
+  return _impl_.localizableparams_;
 }
 
 // optional string deterministicLg = 7;
 inline bool HighlyStructuredMessage::_internal_has_deterministiclg() const {
-  bool value = (_has_bits_[0] & 0x00000010u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
   return value;
 }
 inline bool HighlyStructuredMessage::has_deterministiclg() const {
   return _internal_has_deterministiclg();
 }
 inline void HighlyStructuredMessage::clear_deterministiclg() {
-  deterministiclg_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000010u;
+  _impl_.deterministiclg_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000010u;
 }
 inline const std::string& HighlyStructuredMessage::deterministiclg() const {
   // @@protoc_insertion_point(field_get:proto.HighlyStructuredMessage.deterministicLg)
@@ -35681,8 +37207,8 @@ inline const std::string& HighlyStructuredMessage::deterministiclg() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void HighlyStructuredMessage::set_deterministiclg(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000010u;
- deterministiclg_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000010u;
+ _impl_.deterministiclg_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.HighlyStructuredMessage.deterministicLg)
 }
 inline std::string* HighlyStructuredMessage::mutable_deterministiclg() {
@@ -35691,46 +37217,56 @@ inline std::string* HighlyStructuredMessage::mutable_deterministiclg() {
   return _s;
 }
 inline const std::string& HighlyStructuredMessage::_internal_deterministiclg() const {
-  return deterministiclg_.Get();
+  return _impl_.deterministiclg_.Get();
 }
 inline void HighlyStructuredMessage::_internal_set_deterministiclg(const std::string& value) {
-  _has_bits_[0] |= 0x00000010u;
-  deterministiclg_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  _impl_.deterministiclg_.Set(value, GetArenaForAllocation());
 }
 inline std::string* HighlyStructuredMessage::_internal_mutable_deterministiclg() {
-  _has_bits_[0] |= 0x00000010u;
-  return deterministiclg_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  return _impl_.deterministiclg_.Mutable(GetArenaForAllocation());
 }
 inline std::string* HighlyStructuredMessage::release_deterministiclg() {
   // @@protoc_insertion_point(field_release:proto.HighlyStructuredMessage.deterministicLg)
   if (!_internal_has_deterministiclg()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000010u;
-  return deterministiclg_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000010u;
+  auto* p = _impl_.deterministiclg_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.deterministiclg_.IsDefault()) {
+    _impl_.deterministiclg_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void HighlyStructuredMessage::set_allocated_deterministiclg(std::string* deterministiclg) {
   if (deterministiclg != nullptr) {
-    _has_bits_[0] |= 0x00000010u;
+    _impl_._has_bits_[0] |= 0x00000010u;
   } else {
-    _has_bits_[0] &= ~0x00000010u;
+    _impl_._has_bits_[0] &= ~0x00000010u;
+  }
+  _impl_.deterministiclg_.SetAllocated(deterministiclg, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.deterministiclg_.IsDefault()) {
+    _impl_.deterministiclg_.Set("", GetArenaForAllocation());
   }
-  deterministiclg_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), deterministiclg,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.HighlyStructuredMessage.deterministicLg)
 }
 
 // optional string deterministicLc = 8;
 inline bool HighlyStructuredMessage::_internal_has_deterministiclc() const {
-  bool value = (_has_bits_[0] & 0x00000020u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
   return value;
 }
 inline bool HighlyStructuredMessage::has_deterministiclc() const {
   return _internal_has_deterministiclc();
 }
 inline void HighlyStructuredMessage::clear_deterministiclc() {
-  deterministiclc_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000020u;
+  _impl_.deterministiclc_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000020u;
 }
 inline const std::string& HighlyStructuredMessage::deterministiclc() const {
   // @@protoc_insertion_point(field_get:proto.HighlyStructuredMessage.deterministicLc)
@@ -35739,8 +37275,8 @@ inline const std::string& HighlyStructuredMessage::deterministiclc() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void HighlyStructuredMessage::set_deterministiclc(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000020u;
- deterministiclc_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000020u;
+ _impl_.deterministiclc_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.HighlyStructuredMessage.deterministicLc)
 }
 inline std::string* HighlyStructuredMessage::mutable_deterministiclc() {
@@ -35749,50 +37285,60 @@ inline std::string* HighlyStructuredMessage::mutable_deterministiclc() {
   return _s;
 }
 inline const std::string& HighlyStructuredMessage::_internal_deterministiclc() const {
-  return deterministiclc_.Get();
+  return _impl_.deterministiclc_.Get();
 }
 inline void HighlyStructuredMessage::_internal_set_deterministiclc(const std::string& value) {
-  _has_bits_[0] |= 0x00000020u;
-  deterministiclc_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000020u;
+  _impl_.deterministiclc_.Set(value, GetArenaForAllocation());
 }
 inline std::string* HighlyStructuredMessage::_internal_mutable_deterministiclc() {
-  _has_bits_[0] |= 0x00000020u;
-  return deterministiclc_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000020u;
+  return _impl_.deterministiclc_.Mutable(GetArenaForAllocation());
 }
 inline std::string* HighlyStructuredMessage::release_deterministiclc() {
   // @@protoc_insertion_point(field_release:proto.HighlyStructuredMessage.deterministicLc)
   if (!_internal_has_deterministiclc()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000020u;
-  return deterministiclc_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000020u;
+  auto* p = _impl_.deterministiclc_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.deterministiclc_.IsDefault()) {
+    _impl_.deterministiclc_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void HighlyStructuredMessage::set_allocated_deterministiclc(std::string* deterministiclc) {
   if (deterministiclc != nullptr) {
-    _has_bits_[0] |= 0x00000020u;
+    _impl_._has_bits_[0] |= 0x00000020u;
   } else {
-    _has_bits_[0] &= ~0x00000020u;
+    _impl_._has_bits_[0] &= ~0x00000020u;
+  }
+  _impl_.deterministiclc_.SetAllocated(deterministiclc, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.deterministiclc_.IsDefault()) {
+    _impl_.deterministiclc_.Set("", GetArenaForAllocation());
   }
-  deterministiclc_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), deterministiclc,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.HighlyStructuredMessage.deterministicLc)
 }
 
 // optional .proto.TemplateMessage hydratedHsm = 9;
 inline bool HighlyStructuredMessage::_internal_has_hydratedhsm() const {
-  bool value = (_has_bits_[0] & 0x00000040u) != 0;
-  PROTOBUF_ASSUME(!value || hydratedhsm_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.hydratedhsm_ != nullptr);
   return value;
 }
 inline bool HighlyStructuredMessage::has_hydratedhsm() const {
   return _internal_has_hydratedhsm();
 }
 inline void HighlyStructuredMessage::clear_hydratedhsm() {
-  if (hydratedhsm_ != nullptr) hydratedhsm_->Clear();
-  _has_bits_[0] &= ~0x00000040u;
+  if (_impl_.hydratedhsm_ != nullptr) _impl_.hydratedhsm_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000040u;
 }
 inline const ::proto::TemplateMessage& HighlyStructuredMessage::_internal_hydratedhsm() const {
-  const ::proto::TemplateMessage* p = hydratedhsm_;
+  const ::proto::TemplateMessage* p = _impl_.hydratedhsm_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::TemplateMessage&>(
       ::proto::_TemplateMessage_default_instance_);
 }
@@ -35803,20 +37349,20 @@ inline const ::proto::TemplateMessage& HighlyStructuredMessage::hydratedhsm() co
 inline void HighlyStructuredMessage::unsafe_arena_set_allocated_hydratedhsm(
     ::proto::TemplateMessage* hydratedhsm) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(hydratedhsm_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.hydratedhsm_);
   }
-  hydratedhsm_ = hydratedhsm;
+  _impl_.hydratedhsm_ = hydratedhsm;
   if (hydratedhsm) {
-    _has_bits_[0] |= 0x00000040u;
+    _impl_._has_bits_[0] |= 0x00000040u;
   } else {
-    _has_bits_[0] &= ~0x00000040u;
+    _impl_._has_bits_[0] &= ~0x00000040u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.HighlyStructuredMessage.hydratedHsm)
 }
 inline ::proto::TemplateMessage* HighlyStructuredMessage::release_hydratedhsm() {
-  _has_bits_[0] &= ~0x00000040u;
-  ::proto::TemplateMessage* temp = hydratedhsm_;
-  hydratedhsm_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000040u;
+  ::proto::TemplateMessage* temp = _impl_.hydratedhsm_;
+  _impl_.hydratedhsm_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -35830,18 +37376,18 @@ inline ::proto::TemplateMessage* HighlyStructuredMessage::release_hydratedhsm()
 }
 inline ::proto::TemplateMessage* HighlyStructuredMessage::unsafe_arena_release_hydratedhsm() {
   // @@protoc_insertion_point(field_release:proto.HighlyStructuredMessage.hydratedHsm)
-  _has_bits_[0] &= ~0x00000040u;
-  ::proto::TemplateMessage* temp = hydratedhsm_;
-  hydratedhsm_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000040u;
+  ::proto::TemplateMessage* temp = _impl_.hydratedhsm_;
+  _impl_.hydratedhsm_ = nullptr;
   return temp;
 }
 inline ::proto::TemplateMessage* HighlyStructuredMessage::_internal_mutable_hydratedhsm() {
-  _has_bits_[0] |= 0x00000040u;
-  if (hydratedhsm_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000040u;
+  if (_impl_.hydratedhsm_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::TemplateMessage>(GetArenaForAllocation());
-    hydratedhsm_ = p;
+    _impl_.hydratedhsm_ = p;
   }
-  return hydratedhsm_;
+  return _impl_.hydratedhsm_;
 }
 inline ::proto::TemplateMessage* HighlyStructuredMessage::mutable_hydratedhsm() {
   ::proto::TemplateMessage* _msg = _internal_mutable_hydratedhsm();
@@ -35851,20 +37397,20 @@ inline ::proto::TemplateMessage* HighlyStructuredMessage::mutable_hydratedhsm()
 inline void HighlyStructuredMessage::set_allocated_hydratedhsm(::proto::TemplateMessage* hydratedhsm) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete hydratedhsm_;
+    delete _impl_.hydratedhsm_;
   }
   if (hydratedhsm) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::TemplateMessage>::GetOwningArena(hydratedhsm);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(hydratedhsm);
     if (message_arena != submessage_arena) {
       hydratedhsm = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, hydratedhsm, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000040u;
+    _impl_._has_bits_[0] |= 0x00000040u;
   } else {
-    _has_bits_[0] &= ~0x00000040u;
+    _impl_._has_bits_[0] &= ~0x00000040u;
   }
-  hydratedhsm_ = hydratedhsm;
+  _impl_.hydratedhsm_ = hydratedhsm;
   // @@protoc_insertion_point(field_set_allocated:proto.HighlyStructuredMessage.hydratedHsm)
 }
 
@@ -35874,19 +37420,19 @@ inline void HighlyStructuredMessage::set_allocated_hydratedhsm(::proto::Template
 
 // optional .proto.Message noteMessage = 2;
 inline bool SendPaymentMessage::_internal_has_notemessage() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || notemessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.notemessage_ != nullptr);
   return value;
 }
 inline bool SendPaymentMessage::has_notemessage() const {
   return _internal_has_notemessage();
 }
 inline void SendPaymentMessage::clear_notemessage() {
-  if (notemessage_ != nullptr) notemessage_->Clear();
-  _has_bits_[0] &= ~0x00000001u;
+  if (_impl_.notemessage_ != nullptr) _impl_.notemessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const ::proto::Message& SendPaymentMessage::_internal_notemessage() const {
-  const ::proto::Message* p = notemessage_;
+  const ::proto::Message* p = _impl_.notemessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::Message&>(
       ::proto::_Message_default_instance_);
 }
@@ -35897,20 +37443,20 @@ inline const ::proto::Message& SendPaymentMessage::notemessage() const {
 inline void SendPaymentMessage::unsafe_arena_set_allocated_notemessage(
     ::proto::Message* notemessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(notemessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.notemessage_);
   }
-  notemessage_ = notemessage;
+  _impl_.notemessage_ = notemessage;
   if (notemessage) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.SendPaymentMessage.noteMessage)
 }
 inline ::proto::Message* SendPaymentMessage::release_notemessage() {
-  _has_bits_[0] &= ~0x00000001u;
-  ::proto::Message* temp = notemessage_;
-  notemessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  ::proto::Message* temp = _impl_.notemessage_;
+  _impl_.notemessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -35924,18 +37470,18 @@ inline ::proto::Message* SendPaymentMessage::release_notemessage() {
 }
 inline ::proto::Message* SendPaymentMessage::unsafe_arena_release_notemessage() {
   // @@protoc_insertion_point(field_release:proto.SendPaymentMessage.noteMessage)
-  _has_bits_[0] &= ~0x00000001u;
-  ::proto::Message* temp = notemessage_;
-  notemessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  ::proto::Message* temp = _impl_.notemessage_;
+  _impl_.notemessage_ = nullptr;
   return temp;
 }
 inline ::proto::Message* SendPaymentMessage::_internal_mutable_notemessage() {
-  _has_bits_[0] |= 0x00000001u;
-  if (notemessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000001u;
+  if (_impl_.notemessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::Message>(GetArenaForAllocation());
-    notemessage_ = p;
+    _impl_.notemessage_ = p;
   }
-  return notemessage_;
+  return _impl_.notemessage_;
 }
 inline ::proto::Message* SendPaymentMessage::mutable_notemessage() {
   ::proto::Message* _msg = _internal_mutable_notemessage();
@@ -35945,38 +37491,38 @@ inline ::proto::Message* SendPaymentMessage::mutable_notemessage() {
 inline void SendPaymentMessage::set_allocated_notemessage(::proto::Message* notemessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete notemessage_;
+    delete _impl_.notemessage_;
   }
   if (notemessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::Message>::GetOwningArena(notemessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(notemessage);
     if (message_arena != submessage_arena) {
       notemessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, notemessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  notemessage_ = notemessage;
+  _impl_.notemessage_ = notemessage;
   // @@protoc_insertion_point(field_set_allocated:proto.SendPaymentMessage.noteMessage)
 }
 
 // optional .proto.MessageKey requestMessageKey = 3;
 inline bool SendPaymentMessage::_internal_has_requestmessagekey() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || requestmessagekey_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.requestmessagekey_ != nullptr);
   return value;
 }
 inline bool SendPaymentMessage::has_requestmessagekey() const {
   return _internal_has_requestmessagekey();
 }
 inline void SendPaymentMessage::clear_requestmessagekey() {
-  if (requestmessagekey_ != nullptr) requestmessagekey_->Clear();
-  _has_bits_[0] &= ~0x00000002u;
+  if (_impl_.requestmessagekey_ != nullptr) _impl_.requestmessagekey_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const ::proto::MessageKey& SendPaymentMessage::_internal_requestmessagekey() const {
-  const ::proto::MessageKey* p = requestmessagekey_;
+  const ::proto::MessageKey* p = _impl_.requestmessagekey_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::MessageKey&>(
       ::proto::_MessageKey_default_instance_);
 }
@@ -35987,20 +37533,20 @@ inline const ::proto::MessageKey& SendPaymentMessage::requestmessagekey() const
 inline void SendPaymentMessage::unsafe_arena_set_allocated_requestmessagekey(
     ::proto::MessageKey* requestmessagekey) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(requestmessagekey_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.requestmessagekey_);
   }
-  requestmessagekey_ = requestmessagekey;
+  _impl_.requestmessagekey_ = requestmessagekey;
   if (requestmessagekey) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.SendPaymentMessage.requestMessageKey)
 }
 inline ::proto::MessageKey* SendPaymentMessage::release_requestmessagekey() {
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::MessageKey* temp = requestmessagekey_;
-  requestmessagekey_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::MessageKey* temp = _impl_.requestmessagekey_;
+  _impl_.requestmessagekey_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -36014,18 +37560,18 @@ inline ::proto::MessageKey* SendPaymentMessage::release_requestmessagekey() {
 }
 inline ::proto::MessageKey* SendPaymentMessage::unsafe_arena_release_requestmessagekey() {
   // @@protoc_insertion_point(field_release:proto.SendPaymentMessage.requestMessageKey)
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::MessageKey* temp = requestmessagekey_;
-  requestmessagekey_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::MessageKey* temp = _impl_.requestmessagekey_;
+  _impl_.requestmessagekey_ = nullptr;
   return temp;
 }
 inline ::proto::MessageKey* SendPaymentMessage::_internal_mutable_requestmessagekey() {
-  _has_bits_[0] |= 0x00000002u;
-  if (requestmessagekey_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000002u;
+  if (_impl_.requestmessagekey_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::MessageKey>(GetArenaForAllocation());
-    requestmessagekey_ = p;
+    _impl_.requestmessagekey_ = p;
   }
-  return requestmessagekey_;
+  return _impl_.requestmessagekey_;
 }
 inline ::proto::MessageKey* SendPaymentMessage::mutable_requestmessagekey() {
   ::proto::MessageKey* _msg = _internal_mutable_requestmessagekey();
@@ -36035,20 +37581,20 @@ inline ::proto::MessageKey* SendPaymentMessage::mutable_requestmessagekey() {
 inline void SendPaymentMessage::set_allocated_requestmessagekey(::proto::MessageKey* requestmessagekey) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete requestmessagekey_;
+    delete _impl_.requestmessagekey_;
   }
   if (requestmessagekey) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::MessageKey>::GetOwningArena(requestmessagekey);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(requestmessagekey);
     if (message_arena != submessage_arena) {
       requestmessagekey = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, requestmessagekey, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  requestmessagekey_ = requestmessagekey;
+  _impl_.requestmessagekey_ = requestmessagekey;
   // @@protoc_insertion_point(field_set_allocated:proto.SendPaymentMessage.requestMessageKey)
 }
 
@@ -36058,19 +37604,19 @@ inline void SendPaymentMessage::set_allocated_requestmessagekey(::proto::Message
 
 // optional .proto.Message noteMessage = 4;
 inline bool RequestPaymentMessage::_internal_has_notemessage() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || notemessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.notemessage_ != nullptr);
   return value;
 }
 inline bool RequestPaymentMessage::has_notemessage() const {
   return _internal_has_notemessage();
 }
 inline void RequestPaymentMessage::clear_notemessage() {
-  if (notemessage_ != nullptr) notemessage_->Clear();
-  _has_bits_[0] &= ~0x00000004u;
+  if (_impl_.notemessage_ != nullptr) _impl_.notemessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const ::proto::Message& RequestPaymentMessage::_internal_notemessage() const {
-  const ::proto::Message* p = notemessage_;
+  const ::proto::Message* p = _impl_.notemessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::Message&>(
       ::proto::_Message_default_instance_);
 }
@@ -36081,20 +37627,20 @@ inline const ::proto::Message& RequestPaymentMessage::notemessage() const {
 inline void RequestPaymentMessage::unsafe_arena_set_allocated_notemessage(
     ::proto::Message* notemessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(notemessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.notemessage_);
   }
-  notemessage_ = notemessage;
+  _impl_.notemessage_ = notemessage;
   if (notemessage) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.RequestPaymentMessage.noteMessage)
 }
 inline ::proto::Message* RequestPaymentMessage::release_notemessage() {
-  _has_bits_[0] &= ~0x00000004u;
-  ::proto::Message* temp = notemessage_;
-  notemessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::proto::Message* temp = _impl_.notemessage_;
+  _impl_.notemessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -36108,18 +37654,18 @@ inline ::proto::Message* RequestPaymentMessage::release_notemessage() {
 }
 inline ::proto::Message* RequestPaymentMessage::unsafe_arena_release_notemessage() {
   // @@protoc_insertion_point(field_release:proto.RequestPaymentMessage.noteMessage)
-  _has_bits_[0] &= ~0x00000004u;
-  ::proto::Message* temp = notemessage_;
-  notemessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::proto::Message* temp = _impl_.notemessage_;
+  _impl_.notemessage_ = nullptr;
   return temp;
 }
 inline ::proto::Message* RequestPaymentMessage::_internal_mutable_notemessage() {
-  _has_bits_[0] |= 0x00000004u;
-  if (notemessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000004u;
+  if (_impl_.notemessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::Message>(GetArenaForAllocation());
-    notemessage_ = p;
+    _impl_.notemessage_ = p;
   }
-  return notemessage_;
+  return _impl_.notemessage_;
 }
 inline ::proto::Message* RequestPaymentMessage::mutable_notemessage() {
   ::proto::Message* _msg = _internal_mutable_notemessage();
@@ -36129,34 +37675,34 @@ inline ::proto::Message* RequestPaymentMessage::mutable_notemessage() {
 inline void RequestPaymentMessage::set_allocated_notemessage(::proto::Message* notemessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete notemessage_;
+    delete _impl_.notemessage_;
   }
   if (notemessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::Message>::GetOwningArena(notemessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(notemessage);
     if (message_arena != submessage_arena) {
       notemessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, notemessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
-  notemessage_ = notemessage;
+  _impl_.notemessage_ = notemessage;
   // @@protoc_insertion_point(field_set_allocated:proto.RequestPaymentMessage.noteMessage)
 }
 
 // optional string currencyCodeIso4217 = 1;
 inline bool RequestPaymentMessage::_internal_has_currencycodeiso4217() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool RequestPaymentMessage::has_currencycodeiso4217() const {
   return _internal_has_currencycodeiso4217();
 }
 inline void RequestPaymentMessage::clear_currencycodeiso4217() {
-  currencycodeiso4217_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.currencycodeiso4217_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& RequestPaymentMessage::currencycodeiso4217() const {
   // @@protoc_insertion_point(field_get:proto.RequestPaymentMessage.currencyCodeIso4217)
@@ -36165,8 +37711,8 @@ inline const std::string& RequestPaymentMessage::currencycodeiso4217() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void RequestPaymentMessage::set_currencycodeiso4217(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- currencycodeiso4217_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.currencycodeiso4217_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.RequestPaymentMessage.currencyCodeIso4217)
 }
 inline std::string* RequestPaymentMessage::mutable_currencycodeiso4217() {
@@ -36175,74 +37721,84 @@ inline std::string* RequestPaymentMessage::mutable_currencycodeiso4217() {
   return _s;
 }
 inline const std::string& RequestPaymentMessage::_internal_currencycodeiso4217() const {
-  return currencycodeiso4217_.Get();
+  return _impl_.currencycodeiso4217_.Get();
 }
 inline void RequestPaymentMessage::_internal_set_currencycodeiso4217(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  currencycodeiso4217_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.currencycodeiso4217_.Set(value, GetArenaForAllocation());
 }
 inline std::string* RequestPaymentMessage::_internal_mutable_currencycodeiso4217() {
-  _has_bits_[0] |= 0x00000001u;
-  return currencycodeiso4217_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.currencycodeiso4217_.Mutable(GetArenaForAllocation());
 }
 inline std::string* RequestPaymentMessage::release_currencycodeiso4217() {
   // @@protoc_insertion_point(field_release:proto.RequestPaymentMessage.currencyCodeIso4217)
   if (!_internal_has_currencycodeiso4217()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return currencycodeiso4217_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.currencycodeiso4217_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.currencycodeiso4217_.IsDefault()) {
+    _impl_.currencycodeiso4217_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void RequestPaymentMessage::set_allocated_currencycodeiso4217(std::string* currencycodeiso4217) {
   if (currencycodeiso4217 != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
+  }
+  _impl_.currencycodeiso4217_.SetAllocated(currencycodeiso4217, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.currencycodeiso4217_.IsDefault()) {
+    _impl_.currencycodeiso4217_.Set("", GetArenaForAllocation());
   }
-  currencycodeiso4217_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), currencycodeiso4217,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.RequestPaymentMessage.currencyCodeIso4217)
 }
 
 // optional uint64 amount1000 = 2;
 inline bool RequestPaymentMessage::_internal_has_amount1000() const {
-  bool value = (_has_bits_[0] & 0x00000010u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
   return value;
 }
 inline bool RequestPaymentMessage::has_amount1000() const {
   return _internal_has_amount1000();
 }
 inline void RequestPaymentMessage::clear_amount1000() {
-  amount1000_ = uint64_t{0u};
-  _has_bits_[0] &= ~0x00000010u;
+  _impl_.amount1000_ = uint64_t{0u};
+  _impl_._has_bits_[0] &= ~0x00000010u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 RequestPaymentMessage::_internal_amount1000() const {
-  return amount1000_;
+inline uint64_t RequestPaymentMessage::_internal_amount1000() const {
+  return _impl_.amount1000_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 RequestPaymentMessage::amount1000() const {
+inline uint64_t RequestPaymentMessage::amount1000() const {
   // @@protoc_insertion_point(field_get:proto.RequestPaymentMessage.amount1000)
   return _internal_amount1000();
 }
-inline void RequestPaymentMessage::_internal_set_amount1000(::PROTOBUF_NAMESPACE_ID::uint64 value) {
-  _has_bits_[0] |= 0x00000010u;
-  amount1000_ = value;
+inline void RequestPaymentMessage::_internal_set_amount1000(uint64_t value) {
+  _impl_._has_bits_[0] |= 0x00000010u;
+  _impl_.amount1000_ = value;
 }
-inline void RequestPaymentMessage::set_amount1000(::PROTOBUF_NAMESPACE_ID::uint64 value) {
+inline void RequestPaymentMessage::set_amount1000(uint64_t value) {
   _internal_set_amount1000(value);
   // @@protoc_insertion_point(field_set:proto.RequestPaymentMessage.amount1000)
 }
 
 // optional string requestFrom = 3;
 inline bool RequestPaymentMessage::_internal_has_requestfrom() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool RequestPaymentMessage::has_requestfrom() const {
   return _internal_has_requestfrom();
 }
 inline void RequestPaymentMessage::clear_requestfrom() {
-  requestfrom_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.requestfrom_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& RequestPaymentMessage::requestfrom() const {
   // @@protoc_insertion_point(field_get:proto.RequestPaymentMessage.requestFrom)
@@ -36251,8 +37807,8 @@ inline const std::string& RequestPaymentMessage::requestfrom() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void RequestPaymentMessage::set_requestfrom(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- requestfrom_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.requestfrom_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.RequestPaymentMessage.requestFrom)
 }
 inline std::string* RequestPaymentMessage::mutable_requestfrom() {
@@ -36261,78 +37817,88 @@ inline std::string* RequestPaymentMessage::mutable_requestfrom() {
   return _s;
 }
 inline const std::string& RequestPaymentMessage::_internal_requestfrom() const {
-  return requestfrom_.Get();
+  return _impl_.requestfrom_.Get();
 }
 inline void RequestPaymentMessage::_internal_set_requestfrom(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  requestfrom_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.requestfrom_.Set(value, GetArenaForAllocation());
 }
 inline std::string* RequestPaymentMessage::_internal_mutable_requestfrom() {
-  _has_bits_[0] |= 0x00000002u;
-  return requestfrom_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.requestfrom_.Mutable(GetArenaForAllocation());
 }
 inline std::string* RequestPaymentMessage::release_requestfrom() {
   // @@protoc_insertion_point(field_release:proto.RequestPaymentMessage.requestFrom)
   if (!_internal_has_requestfrom()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return requestfrom_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.requestfrom_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.requestfrom_.IsDefault()) {
+    _impl_.requestfrom_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void RequestPaymentMessage::set_allocated_requestfrom(std::string* requestfrom) {
   if (requestfrom != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
+  }
+  _impl_.requestfrom_.SetAllocated(requestfrom, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.requestfrom_.IsDefault()) {
+    _impl_.requestfrom_.Set("", GetArenaForAllocation());
   }
-  requestfrom_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), requestfrom,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.RequestPaymentMessage.requestFrom)
 }
 
 // optional int64 expiryTimestamp = 5;
 inline bool RequestPaymentMessage::_internal_has_expirytimestamp() const {
-  bool value = (_has_bits_[0] & 0x00000020u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
   return value;
 }
 inline bool RequestPaymentMessage::has_expirytimestamp() const {
   return _internal_has_expirytimestamp();
 }
 inline void RequestPaymentMessage::clear_expirytimestamp() {
-  expirytimestamp_ = int64_t{0};
-  _has_bits_[0] &= ~0x00000020u;
+  _impl_.expirytimestamp_ = int64_t{0};
+  _impl_._has_bits_[0] &= ~0x00000020u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 RequestPaymentMessage::_internal_expirytimestamp() const {
-  return expirytimestamp_;
+inline int64_t RequestPaymentMessage::_internal_expirytimestamp() const {
+  return _impl_.expirytimestamp_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 RequestPaymentMessage::expirytimestamp() const {
+inline int64_t RequestPaymentMessage::expirytimestamp() const {
   // @@protoc_insertion_point(field_get:proto.RequestPaymentMessage.expiryTimestamp)
   return _internal_expirytimestamp();
 }
-inline void RequestPaymentMessage::_internal_set_expirytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value) {
-  _has_bits_[0] |= 0x00000020u;
-  expirytimestamp_ = value;
+inline void RequestPaymentMessage::_internal_set_expirytimestamp(int64_t value) {
+  _impl_._has_bits_[0] |= 0x00000020u;
+  _impl_.expirytimestamp_ = value;
 }
-inline void RequestPaymentMessage::set_expirytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value) {
+inline void RequestPaymentMessage::set_expirytimestamp(int64_t value) {
   _internal_set_expirytimestamp(value);
   // @@protoc_insertion_point(field_set:proto.RequestPaymentMessage.expiryTimestamp)
 }
 
 // optional .proto.PaymentMoney amount = 6;
 inline bool RequestPaymentMessage::_internal_has_amount() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
-  PROTOBUF_ASSUME(!value || amount_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.amount_ != nullptr);
   return value;
 }
 inline bool RequestPaymentMessage::has_amount() const {
   return _internal_has_amount();
 }
 inline void RequestPaymentMessage::clear_amount() {
-  if (amount_ != nullptr) amount_->Clear();
-  _has_bits_[0] &= ~0x00000008u;
+  if (_impl_.amount_ != nullptr) _impl_.amount_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline const ::proto::PaymentMoney& RequestPaymentMessage::_internal_amount() const {
-  const ::proto::PaymentMoney* p = amount_;
+  const ::proto::PaymentMoney* p = _impl_.amount_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::PaymentMoney&>(
       ::proto::_PaymentMoney_default_instance_);
 }
@@ -36343,20 +37909,20 @@ inline const ::proto::PaymentMoney& RequestPaymentMessage::amount() const {
 inline void RequestPaymentMessage::unsafe_arena_set_allocated_amount(
     ::proto::PaymentMoney* amount) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(amount_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.amount_);
   }
-  amount_ = amount;
+  _impl_.amount_ = amount;
   if (amount) {
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.RequestPaymentMessage.amount)
 }
 inline ::proto::PaymentMoney* RequestPaymentMessage::release_amount() {
-  _has_bits_[0] &= ~0x00000008u;
-  ::proto::PaymentMoney* temp = amount_;
-  amount_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  ::proto::PaymentMoney* temp = _impl_.amount_;
+  _impl_.amount_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -36370,18 +37936,18 @@ inline ::proto::PaymentMoney* RequestPaymentMessage::release_amount() {
 }
 inline ::proto::PaymentMoney* RequestPaymentMessage::unsafe_arena_release_amount() {
   // @@protoc_insertion_point(field_release:proto.RequestPaymentMessage.amount)
-  _has_bits_[0] &= ~0x00000008u;
-  ::proto::PaymentMoney* temp = amount_;
-  amount_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  ::proto::PaymentMoney* temp = _impl_.amount_;
+  _impl_.amount_ = nullptr;
   return temp;
 }
 inline ::proto::PaymentMoney* RequestPaymentMessage::_internal_mutable_amount() {
-  _has_bits_[0] |= 0x00000008u;
-  if (amount_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000008u;
+  if (_impl_.amount_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::PaymentMoney>(GetArenaForAllocation());
-    amount_ = p;
+    _impl_.amount_ = p;
   }
-  return amount_;
+  return _impl_.amount_;
 }
 inline ::proto::PaymentMoney* RequestPaymentMessage::mutable_amount() {
   ::proto::PaymentMoney* _msg = _internal_mutable_amount();
@@ -36391,20 +37957,20 @@ inline ::proto::PaymentMoney* RequestPaymentMessage::mutable_amount() {
 inline void RequestPaymentMessage::set_allocated_amount(::proto::PaymentMoney* amount) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete amount_;
+    delete _impl_.amount_;
   }
   if (amount) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::PaymentMoney>::GetOwningArena(amount);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(amount);
     if (message_arena != submessage_arena) {
       amount = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, amount, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
   }
-  amount_ = amount;
+  _impl_.amount_ = amount;
   // @@protoc_insertion_point(field_set_allocated:proto.RequestPaymentMessage.amount)
 }
 
@@ -36414,19 +37980,19 @@ inline void RequestPaymentMessage::set_allocated_amount(::proto::PaymentMoney* a
 
 // optional .proto.MessageKey key = 1;
 inline bool DeclinePaymentRequestMessage::_internal_has_key() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || key_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.key_ != nullptr);
   return value;
 }
 inline bool DeclinePaymentRequestMessage::has_key() const {
   return _internal_has_key();
 }
 inline void DeclinePaymentRequestMessage::clear_key() {
-  if (key_ != nullptr) key_->Clear();
-  _has_bits_[0] &= ~0x00000001u;
+  if (_impl_.key_ != nullptr) _impl_.key_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const ::proto::MessageKey& DeclinePaymentRequestMessage::_internal_key() const {
-  const ::proto::MessageKey* p = key_;
+  const ::proto::MessageKey* p = _impl_.key_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::MessageKey&>(
       ::proto::_MessageKey_default_instance_);
 }
@@ -36437,20 +38003,20 @@ inline const ::proto::MessageKey& DeclinePaymentRequestMessage::key() const {
 inline void DeclinePaymentRequestMessage::unsafe_arena_set_allocated_key(
     ::proto::MessageKey* key) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(key_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.key_);
   }
-  key_ = key;
+  _impl_.key_ = key;
   if (key) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.DeclinePaymentRequestMessage.key)
 }
 inline ::proto::MessageKey* DeclinePaymentRequestMessage::release_key() {
-  _has_bits_[0] &= ~0x00000001u;
-  ::proto::MessageKey* temp = key_;
-  key_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  ::proto::MessageKey* temp = _impl_.key_;
+  _impl_.key_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -36464,18 +38030,18 @@ inline ::proto::MessageKey* DeclinePaymentRequestMessage::release_key() {
 }
 inline ::proto::MessageKey* DeclinePaymentRequestMessage::unsafe_arena_release_key() {
   // @@protoc_insertion_point(field_release:proto.DeclinePaymentRequestMessage.key)
-  _has_bits_[0] &= ~0x00000001u;
-  ::proto::MessageKey* temp = key_;
-  key_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  ::proto::MessageKey* temp = _impl_.key_;
+  _impl_.key_ = nullptr;
   return temp;
 }
 inline ::proto::MessageKey* DeclinePaymentRequestMessage::_internal_mutable_key() {
-  _has_bits_[0] |= 0x00000001u;
-  if (key_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000001u;
+  if (_impl_.key_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::MessageKey>(GetArenaForAllocation());
-    key_ = p;
+    _impl_.key_ = p;
   }
-  return key_;
+  return _impl_.key_;
 }
 inline ::proto::MessageKey* DeclinePaymentRequestMessage::mutable_key() {
   ::proto::MessageKey* _msg = _internal_mutable_key();
@@ -36485,20 +38051,20 @@ inline ::proto::MessageKey* DeclinePaymentRequestMessage::mutable_key() {
 inline void DeclinePaymentRequestMessage::set_allocated_key(::proto::MessageKey* key) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete key_;
+    delete _impl_.key_;
   }
   if (key) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::MessageKey>::GetOwningArena(key);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(key);
     if (message_arena != submessage_arena) {
       key = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, key, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  key_ = key;
+  _impl_.key_ = key;
   // @@protoc_insertion_point(field_set_allocated:proto.DeclinePaymentRequestMessage.key)
 }
 
@@ -36508,19 +38074,19 @@ inline void DeclinePaymentRequestMessage::set_allocated_key(::proto::MessageKey*
 
 // optional .proto.MessageKey key = 1;
 inline bool CancelPaymentRequestMessage::_internal_has_key() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || key_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.key_ != nullptr);
   return value;
 }
 inline bool CancelPaymentRequestMessage::has_key() const {
   return _internal_has_key();
 }
 inline void CancelPaymentRequestMessage::clear_key() {
-  if (key_ != nullptr) key_->Clear();
-  _has_bits_[0] &= ~0x00000001u;
+  if (_impl_.key_ != nullptr) _impl_.key_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const ::proto::MessageKey& CancelPaymentRequestMessage::_internal_key() const {
-  const ::proto::MessageKey* p = key_;
+  const ::proto::MessageKey* p = _impl_.key_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::MessageKey&>(
       ::proto::_MessageKey_default_instance_);
 }
@@ -36531,20 +38097,20 @@ inline const ::proto::MessageKey& CancelPaymentRequestMessage::key() const {
 inline void CancelPaymentRequestMessage::unsafe_arena_set_allocated_key(
     ::proto::MessageKey* key) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(key_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.key_);
   }
-  key_ = key;
+  _impl_.key_ = key;
   if (key) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.CancelPaymentRequestMessage.key)
 }
 inline ::proto::MessageKey* CancelPaymentRequestMessage::release_key() {
-  _has_bits_[0] &= ~0x00000001u;
-  ::proto::MessageKey* temp = key_;
-  key_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  ::proto::MessageKey* temp = _impl_.key_;
+  _impl_.key_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -36558,18 +38124,18 @@ inline ::proto::MessageKey* CancelPaymentRequestMessage::release_key() {
 }
 inline ::proto::MessageKey* CancelPaymentRequestMessage::unsafe_arena_release_key() {
   // @@protoc_insertion_point(field_release:proto.CancelPaymentRequestMessage.key)
-  _has_bits_[0] &= ~0x00000001u;
-  ::proto::MessageKey* temp = key_;
-  key_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  ::proto::MessageKey* temp = _impl_.key_;
+  _impl_.key_ = nullptr;
   return temp;
 }
 inline ::proto::MessageKey* CancelPaymentRequestMessage::_internal_mutable_key() {
-  _has_bits_[0] |= 0x00000001u;
-  if (key_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000001u;
+  if (_impl_.key_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::MessageKey>(GetArenaForAllocation());
-    key_ = p;
+    _impl_.key_ = p;
   }
-  return key_;
+  return _impl_.key_;
 }
 inline ::proto::MessageKey* CancelPaymentRequestMessage::mutable_key() {
   ::proto::MessageKey* _msg = _internal_mutable_key();
@@ -36579,20 +38145,20 @@ inline ::proto::MessageKey* CancelPaymentRequestMessage::mutable_key() {
 inline void CancelPaymentRequestMessage::set_allocated_key(::proto::MessageKey* key) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete key_;
+    delete _impl_.key_;
   }
   if (key) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::MessageKey>::GetOwningArena(key);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(key);
     if (message_arena != submessage_arena) {
       key = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, key, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  key_ = key;
+  _impl_.key_ = key;
   // @@protoc_insertion_point(field_set_allocated:proto.CancelPaymentRequestMessage.key)
 }
 
@@ -36602,26 +38168,26 @@ inline void CancelPaymentRequestMessage::set_allocated_key(::proto::MessageKey*
 
 // optional double degreesLatitude = 1;
 inline bool LiveLocationMessage::_internal_has_degreeslatitude() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool LiveLocationMessage::has_degreeslatitude() const {
   return _internal_has_degreeslatitude();
 }
 inline void LiveLocationMessage::clear_degreeslatitude() {
-  degreeslatitude_ = 0;
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.degreeslatitude_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline double LiveLocationMessage::_internal_degreeslatitude() const {
-  return degreeslatitude_;
+  return _impl_.degreeslatitude_;
 }
 inline double LiveLocationMessage::degreeslatitude() const {
   // @@protoc_insertion_point(field_get:proto.LiveLocationMessage.degreesLatitude)
   return _internal_degreeslatitude();
 }
 inline void LiveLocationMessage::_internal_set_degreeslatitude(double value) {
-  _has_bits_[0] |= 0x00000008u;
-  degreeslatitude_ = value;
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.degreeslatitude_ = value;
 }
 inline void LiveLocationMessage::set_degreeslatitude(double value) {
   _internal_set_degreeslatitude(value);
@@ -36630,26 +38196,26 @@ inline void LiveLocationMessage::set_degreeslatitude(double value) {
 
 // optional double degreesLongitude = 2;
 inline bool LiveLocationMessage::_internal_has_degreeslongitude() const {
-  bool value = (_has_bits_[0] & 0x00000010u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
   return value;
 }
 inline bool LiveLocationMessage::has_degreeslongitude() const {
   return _internal_has_degreeslongitude();
 }
 inline void LiveLocationMessage::clear_degreeslongitude() {
-  degreeslongitude_ = 0;
-  _has_bits_[0] &= ~0x00000010u;
+  _impl_.degreeslongitude_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000010u;
 }
 inline double LiveLocationMessage::_internal_degreeslongitude() const {
-  return degreeslongitude_;
+  return _impl_.degreeslongitude_;
 }
 inline double LiveLocationMessage::degreeslongitude() const {
   // @@protoc_insertion_point(field_get:proto.LiveLocationMessage.degreesLongitude)
   return _internal_degreeslongitude();
 }
 inline void LiveLocationMessage::_internal_set_degreeslongitude(double value) {
-  _has_bits_[0] |= 0x00000010u;
-  degreeslongitude_ = value;
+  _impl_._has_bits_[0] |= 0x00000010u;
+  _impl_.degreeslongitude_ = value;
 }
 inline void LiveLocationMessage::set_degreeslongitude(double value) {
   _internal_set_degreeslongitude(value);
@@ -36658,54 +38224,54 @@ inline void LiveLocationMessage::set_degreeslongitude(double value) {
 
 // optional uint32 accuracyInMeters = 3;
 inline bool LiveLocationMessage::_internal_has_accuracyinmeters() const {
-  bool value = (_has_bits_[0] & 0x00000020u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
   return value;
 }
 inline bool LiveLocationMessage::has_accuracyinmeters() const {
   return _internal_has_accuracyinmeters();
 }
 inline void LiveLocationMessage::clear_accuracyinmeters() {
-  accuracyinmeters_ = 0u;
-  _has_bits_[0] &= ~0x00000020u;
+  _impl_.accuracyinmeters_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000020u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 LiveLocationMessage::_internal_accuracyinmeters() const {
-  return accuracyinmeters_;
+inline uint32_t LiveLocationMessage::_internal_accuracyinmeters() const {
+  return _impl_.accuracyinmeters_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 LiveLocationMessage::accuracyinmeters() const {
+inline uint32_t LiveLocationMessage::accuracyinmeters() const {
   // @@protoc_insertion_point(field_get:proto.LiveLocationMessage.accuracyInMeters)
   return _internal_accuracyinmeters();
 }
-inline void LiveLocationMessage::_internal_set_accuracyinmeters(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000020u;
-  accuracyinmeters_ = value;
+inline void LiveLocationMessage::_internal_set_accuracyinmeters(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000020u;
+  _impl_.accuracyinmeters_ = value;
 }
-inline void LiveLocationMessage::set_accuracyinmeters(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void LiveLocationMessage::set_accuracyinmeters(uint32_t value) {
   _internal_set_accuracyinmeters(value);
   // @@protoc_insertion_point(field_set:proto.LiveLocationMessage.accuracyInMeters)
 }
 
 // optional float speedInMps = 4;
 inline bool LiveLocationMessage::_internal_has_speedinmps() const {
-  bool value = (_has_bits_[0] & 0x00000040u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
   return value;
 }
 inline bool LiveLocationMessage::has_speedinmps() const {
   return _internal_has_speedinmps();
 }
 inline void LiveLocationMessage::clear_speedinmps() {
-  speedinmps_ = 0;
-  _has_bits_[0] &= ~0x00000040u;
+  _impl_.speedinmps_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000040u;
 }
 inline float LiveLocationMessage::_internal_speedinmps() const {
-  return speedinmps_;
+  return _impl_.speedinmps_;
 }
 inline float LiveLocationMessage::speedinmps() const {
   // @@protoc_insertion_point(field_get:proto.LiveLocationMessage.speedInMps)
   return _internal_speedinmps();
 }
 inline void LiveLocationMessage::_internal_set_speedinmps(float value) {
-  _has_bits_[0] |= 0x00000040u;
-  speedinmps_ = value;
+  _impl_._has_bits_[0] |= 0x00000040u;
+  _impl_.speedinmps_ = value;
 }
 inline void LiveLocationMessage::set_speedinmps(float value) {
   _internal_set_speedinmps(value);
@@ -36714,43 +38280,43 @@ inline void LiveLocationMessage::set_speedinmps(float value) {
 
 // optional uint32 degreesClockwiseFromMagneticNorth = 5;
 inline bool LiveLocationMessage::_internal_has_degreesclockwisefrommagneticnorth() const {
-  bool value = (_has_bits_[0] & 0x00000080u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000080u) != 0;
   return value;
 }
 inline bool LiveLocationMessage::has_degreesclockwisefrommagneticnorth() const {
   return _internal_has_degreesclockwisefrommagneticnorth();
 }
 inline void LiveLocationMessage::clear_degreesclockwisefrommagneticnorth() {
-  degreesclockwisefrommagneticnorth_ = 0u;
-  _has_bits_[0] &= ~0x00000080u;
+  _impl_.degreesclockwisefrommagneticnorth_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000080u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 LiveLocationMessage::_internal_degreesclockwisefrommagneticnorth() const {
-  return degreesclockwisefrommagneticnorth_;
+inline uint32_t LiveLocationMessage::_internal_degreesclockwisefrommagneticnorth() const {
+  return _impl_.degreesclockwisefrommagneticnorth_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 LiveLocationMessage::degreesclockwisefrommagneticnorth() const {
+inline uint32_t LiveLocationMessage::degreesclockwisefrommagneticnorth() const {
   // @@protoc_insertion_point(field_get:proto.LiveLocationMessage.degreesClockwiseFromMagneticNorth)
   return _internal_degreesclockwisefrommagneticnorth();
 }
-inline void LiveLocationMessage::_internal_set_degreesclockwisefrommagneticnorth(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000080u;
-  degreesclockwisefrommagneticnorth_ = value;
+inline void LiveLocationMessage::_internal_set_degreesclockwisefrommagneticnorth(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000080u;
+  _impl_.degreesclockwisefrommagneticnorth_ = value;
 }
-inline void LiveLocationMessage::set_degreesclockwisefrommagneticnorth(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void LiveLocationMessage::set_degreesclockwisefrommagneticnorth(uint32_t value) {
   _internal_set_degreesclockwisefrommagneticnorth(value);
   // @@protoc_insertion_point(field_set:proto.LiveLocationMessage.degreesClockwiseFromMagneticNorth)
 }
 
 // optional string caption = 6;
 inline bool LiveLocationMessage::_internal_has_caption() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool LiveLocationMessage::has_caption() const {
   return _internal_has_caption();
 }
 inline void LiveLocationMessage::clear_caption() {
-  caption_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.caption_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& LiveLocationMessage::caption() const {
   // @@protoc_insertion_point(field_get:proto.LiveLocationMessage.caption)
@@ -36759,8 +38325,8 @@ inline const std::string& LiveLocationMessage::caption() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void LiveLocationMessage::set_caption(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- caption_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.caption_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.LiveLocationMessage.caption)
 }
 inline std::string* LiveLocationMessage::mutable_caption() {
@@ -36769,102 +38335,112 @@ inline std::string* LiveLocationMessage::mutable_caption() {
   return _s;
 }
 inline const std::string& LiveLocationMessage::_internal_caption() const {
-  return caption_.Get();
+  return _impl_.caption_.Get();
 }
 inline void LiveLocationMessage::_internal_set_caption(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  caption_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.caption_.Set(value, GetArenaForAllocation());
 }
 inline std::string* LiveLocationMessage::_internal_mutable_caption() {
-  _has_bits_[0] |= 0x00000001u;
-  return caption_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.caption_.Mutable(GetArenaForAllocation());
 }
 inline std::string* LiveLocationMessage::release_caption() {
   // @@protoc_insertion_point(field_release:proto.LiveLocationMessage.caption)
   if (!_internal_has_caption()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return caption_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.caption_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.caption_.IsDefault()) {
+    _impl_.caption_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void LiveLocationMessage::set_allocated_caption(std::string* caption) {
   if (caption != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
+  }
+  _impl_.caption_.SetAllocated(caption, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.caption_.IsDefault()) {
+    _impl_.caption_.Set("", GetArenaForAllocation());
   }
-  caption_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), caption,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.LiveLocationMessage.caption)
 }
 
 // optional int64 sequenceNumber = 7;
 inline bool LiveLocationMessage::_internal_has_sequencenumber() const {
-  bool value = (_has_bits_[0] & 0x00000200u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000200u) != 0;
   return value;
 }
 inline bool LiveLocationMessage::has_sequencenumber() const {
   return _internal_has_sequencenumber();
 }
 inline void LiveLocationMessage::clear_sequencenumber() {
-  sequencenumber_ = int64_t{0};
-  _has_bits_[0] &= ~0x00000200u;
+  _impl_.sequencenumber_ = int64_t{0};
+  _impl_._has_bits_[0] &= ~0x00000200u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 LiveLocationMessage::_internal_sequencenumber() const {
-  return sequencenumber_;
+inline int64_t LiveLocationMessage::_internal_sequencenumber() const {
+  return _impl_.sequencenumber_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 LiveLocationMessage::sequencenumber() const {
+inline int64_t LiveLocationMessage::sequencenumber() const {
   // @@protoc_insertion_point(field_get:proto.LiveLocationMessage.sequenceNumber)
   return _internal_sequencenumber();
 }
-inline void LiveLocationMessage::_internal_set_sequencenumber(::PROTOBUF_NAMESPACE_ID::int64 value) {
-  _has_bits_[0] |= 0x00000200u;
-  sequencenumber_ = value;
+inline void LiveLocationMessage::_internal_set_sequencenumber(int64_t value) {
+  _impl_._has_bits_[0] |= 0x00000200u;
+  _impl_.sequencenumber_ = value;
 }
-inline void LiveLocationMessage::set_sequencenumber(::PROTOBUF_NAMESPACE_ID::int64 value) {
+inline void LiveLocationMessage::set_sequencenumber(int64_t value) {
   _internal_set_sequencenumber(value);
   // @@protoc_insertion_point(field_set:proto.LiveLocationMessage.sequenceNumber)
 }
 
 // optional uint32 timeOffset = 8;
 inline bool LiveLocationMessage::_internal_has_timeoffset() const {
-  bool value = (_has_bits_[0] & 0x00000100u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000100u) != 0;
   return value;
 }
 inline bool LiveLocationMessage::has_timeoffset() const {
   return _internal_has_timeoffset();
 }
 inline void LiveLocationMessage::clear_timeoffset() {
-  timeoffset_ = 0u;
-  _has_bits_[0] &= ~0x00000100u;
+  _impl_.timeoffset_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000100u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 LiveLocationMessage::_internal_timeoffset() const {
-  return timeoffset_;
+inline uint32_t LiveLocationMessage::_internal_timeoffset() const {
+  return _impl_.timeoffset_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 LiveLocationMessage::timeoffset() const {
+inline uint32_t LiveLocationMessage::timeoffset() const {
   // @@protoc_insertion_point(field_get:proto.LiveLocationMessage.timeOffset)
   return _internal_timeoffset();
 }
-inline void LiveLocationMessage::_internal_set_timeoffset(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000100u;
-  timeoffset_ = value;
+inline void LiveLocationMessage::_internal_set_timeoffset(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000100u;
+  _impl_.timeoffset_ = value;
 }
-inline void LiveLocationMessage::set_timeoffset(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void LiveLocationMessage::set_timeoffset(uint32_t value) {
   _internal_set_timeoffset(value);
   // @@protoc_insertion_point(field_set:proto.LiveLocationMessage.timeOffset)
 }
 
 // optional bytes jpegThumbnail = 16;
 inline bool LiveLocationMessage::_internal_has_jpegthumbnail() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool LiveLocationMessage::has_jpegthumbnail() const {
   return _internal_has_jpegthumbnail();
 }
 inline void LiveLocationMessage::clear_jpegthumbnail() {
-  jpegthumbnail_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.jpegthumbnail_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& LiveLocationMessage::jpegthumbnail() const {
   // @@protoc_insertion_point(field_get:proto.LiveLocationMessage.jpegThumbnail)
@@ -36873,8 +38449,8 @@ inline const std::string& LiveLocationMessage::jpegthumbnail() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void LiveLocationMessage::set_jpegthumbnail(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- jpegthumbnail_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.jpegthumbnail_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.LiveLocationMessage.jpegThumbnail)
 }
 inline std::string* LiveLocationMessage::mutable_jpegthumbnail() {
@@ -36883,50 +38459,60 @@ inline std::string* LiveLocationMessage::mutable_jpegthumbnail() {
   return _s;
 }
 inline const std::string& LiveLocationMessage::_internal_jpegthumbnail() const {
-  return jpegthumbnail_.Get();
+  return _impl_.jpegthumbnail_.Get();
 }
 inline void LiveLocationMessage::_internal_set_jpegthumbnail(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  jpegthumbnail_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.jpegthumbnail_.Set(value, GetArenaForAllocation());
 }
 inline std::string* LiveLocationMessage::_internal_mutable_jpegthumbnail() {
-  _has_bits_[0] |= 0x00000002u;
-  return jpegthumbnail_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.jpegthumbnail_.Mutable(GetArenaForAllocation());
 }
 inline std::string* LiveLocationMessage::release_jpegthumbnail() {
   // @@protoc_insertion_point(field_release:proto.LiveLocationMessage.jpegThumbnail)
   if (!_internal_has_jpegthumbnail()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return jpegthumbnail_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.jpegthumbnail_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.jpegthumbnail_.IsDefault()) {
+    _impl_.jpegthumbnail_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void LiveLocationMessage::set_allocated_jpegthumbnail(std::string* jpegthumbnail) {
   if (jpegthumbnail != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  jpegthumbnail_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), jpegthumbnail,
-      GetArenaForAllocation());
+  _impl_.jpegthumbnail_.SetAllocated(jpegthumbnail, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.jpegthumbnail_.IsDefault()) {
+    _impl_.jpegthumbnail_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.LiveLocationMessage.jpegThumbnail)
 }
 
 // optional .proto.ContextInfo contextInfo = 17;
 inline bool LiveLocationMessage::_internal_has_contextinfo() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || contextinfo_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.contextinfo_ != nullptr);
   return value;
 }
 inline bool LiveLocationMessage::has_contextinfo() const {
   return _internal_has_contextinfo();
 }
 inline void LiveLocationMessage::clear_contextinfo() {
-  if (contextinfo_ != nullptr) contextinfo_->Clear();
-  _has_bits_[0] &= ~0x00000004u;
+  if (_impl_.contextinfo_ != nullptr) _impl_.contextinfo_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const ::proto::ContextInfo& LiveLocationMessage::_internal_contextinfo() const {
-  const ::proto::ContextInfo* p = contextinfo_;
+  const ::proto::ContextInfo* p = _impl_.contextinfo_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ContextInfo&>(
       ::proto::_ContextInfo_default_instance_);
 }
@@ -36937,20 +38523,20 @@ inline const ::proto::ContextInfo& LiveLocationMessage::contextinfo() const {
 inline void LiveLocationMessage::unsafe_arena_set_allocated_contextinfo(
     ::proto::ContextInfo* contextinfo) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(contextinfo_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.contextinfo_);
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   if (contextinfo) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.LiveLocationMessage.contextInfo)
 }
 inline ::proto::ContextInfo* LiveLocationMessage::release_contextinfo() {
-  _has_bits_[0] &= ~0x00000004u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -36964,18 +38550,18 @@ inline ::proto::ContextInfo* LiveLocationMessage::release_contextinfo() {
 }
 inline ::proto::ContextInfo* LiveLocationMessage::unsafe_arena_release_contextinfo() {
   // @@protoc_insertion_point(field_release:proto.LiveLocationMessage.contextInfo)
-  _has_bits_[0] &= ~0x00000004u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
   return temp;
 }
 inline ::proto::ContextInfo* LiveLocationMessage::_internal_mutable_contextinfo() {
-  _has_bits_[0] |= 0x00000004u;
-  if (contextinfo_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000004u;
+  if (_impl_.contextinfo_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ContextInfo>(GetArenaForAllocation());
-    contextinfo_ = p;
+    _impl_.contextinfo_ = p;
   }
-  return contextinfo_;
+  return _impl_.contextinfo_;
 }
 inline ::proto::ContextInfo* LiveLocationMessage::mutable_contextinfo() {
   ::proto::ContextInfo* _msg = _internal_mutable_contextinfo();
@@ -36985,20 +38571,20 @@ inline ::proto::ContextInfo* LiveLocationMessage::mutable_contextinfo() {
 inline void LiveLocationMessage::set_allocated_contextinfo(::proto::ContextInfo* contextinfo) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete contextinfo_;
+    delete _impl_.contextinfo_;
   }
   if (contextinfo) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ContextInfo>::GetOwningArena(contextinfo);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(contextinfo);
     if (message_arena != submessage_arena) {
       contextinfo = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, contextinfo, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   // @@protoc_insertion_point(field_set_allocated:proto.LiveLocationMessage.contextInfo)
 }
 
@@ -37008,15 +38594,15 @@ inline void LiveLocationMessage::set_allocated_contextinfo(::proto::ContextInfo*
 
 // optional string url = 1;
 inline bool StickerMessage::_internal_has_url() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool StickerMessage::has_url() const {
   return _internal_has_url();
 }
 inline void StickerMessage::clear_url() {
-  url_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.url_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& StickerMessage::url() const {
   // @@protoc_insertion_point(field_get:proto.StickerMessage.url)
@@ -37025,8 +38611,8 @@ inline const std::string& StickerMessage::url() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void StickerMessage::set_url(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- url_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.url_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.StickerMessage.url)
 }
 inline std::string* StickerMessage::mutable_url() {
@@ -37035,46 +38621,56 @@ inline std::string* StickerMessage::mutable_url() {
   return _s;
 }
 inline const std::string& StickerMessage::_internal_url() const {
-  return url_.Get();
+  return _impl_.url_.Get();
 }
 inline void StickerMessage::_internal_set_url(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  url_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.url_.Set(value, GetArenaForAllocation());
 }
 inline std::string* StickerMessage::_internal_mutable_url() {
-  _has_bits_[0] |= 0x00000001u;
-  return url_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.url_.Mutable(GetArenaForAllocation());
 }
 inline std::string* StickerMessage::release_url() {
   // @@protoc_insertion_point(field_release:proto.StickerMessage.url)
   if (!_internal_has_url()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return url_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.url_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.url_.IsDefault()) {
+    _impl_.url_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void StickerMessage::set_allocated_url(std::string* url) {
   if (url != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  url_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), url,
-      GetArenaForAllocation());
+  _impl_.url_.SetAllocated(url, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.url_.IsDefault()) {
+    _impl_.url_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.StickerMessage.url)
 }
 
 // optional bytes fileSha256 = 2;
 inline bool StickerMessage::_internal_has_filesha256() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool StickerMessage::has_filesha256() const {
   return _internal_has_filesha256();
 }
 inline void StickerMessage::clear_filesha256() {
-  filesha256_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.filesha256_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& StickerMessage::filesha256() const {
   // @@protoc_insertion_point(field_get:proto.StickerMessage.fileSha256)
@@ -37083,8 +38679,8 @@ inline const std::string& StickerMessage::filesha256() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void StickerMessage::set_filesha256(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- filesha256_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.filesha256_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.StickerMessage.fileSha256)
 }
 inline std::string* StickerMessage::mutable_filesha256() {
@@ -37093,46 +38689,56 @@ inline std::string* StickerMessage::mutable_filesha256() {
   return _s;
 }
 inline const std::string& StickerMessage::_internal_filesha256() const {
-  return filesha256_.Get();
+  return _impl_.filesha256_.Get();
 }
 inline void StickerMessage::_internal_set_filesha256(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  filesha256_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.filesha256_.Set(value, GetArenaForAllocation());
 }
 inline std::string* StickerMessage::_internal_mutable_filesha256() {
-  _has_bits_[0] |= 0x00000002u;
-  return filesha256_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.filesha256_.Mutable(GetArenaForAllocation());
 }
 inline std::string* StickerMessage::release_filesha256() {
   // @@protoc_insertion_point(field_release:proto.StickerMessage.fileSha256)
   if (!_internal_has_filesha256()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return filesha256_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.filesha256_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.filesha256_.IsDefault()) {
+    _impl_.filesha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void StickerMessage::set_allocated_filesha256(std::string* filesha256) {
   if (filesha256 != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  filesha256_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), filesha256,
-      GetArenaForAllocation());
+  _impl_.filesha256_.SetAllocated(filesha256, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.filesha256_.IsDefault()) {
+    _impl_.filesha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.StickerMessage.fileSha256)
 }
 
 // optional bytes fileEncSha256 = 3;
 inline bool StickerMessage::_internal_has_fileencsha256() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool StickerMessage::has_fileencsha256() const {
   return _internal_has_fileencsha256();
 }
 inline void StickerMessage::clear_fileencsha256() {
-  fileencsha256_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.fileencsha256_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const std::string& StickerMessage::fileencsha256() const {
   // @@protoc_insertion_point(field_get:proto.StickerMessage.fileEncSha256)
@@ -37141,8 +38747,8 @@ inline const std::string& StickerMessage::fileencsha256() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void StickerMessage::set_fileencsha256(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000004u;
- fileencsha256_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000004u;
+ _impl_.fileencsha256_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.StickerMessage.fileEncSha256)
 }
 inline std::string* StickerMessage::mutable_fileencsha256() {
@@ -37151,46 +38757,56 @@ inline std::string* StickerMessage::mutable_fileencsha256() {
   return _s;
 }
 inline const std::string& StickerMessage::_internal_fileencsha256() const {
-  return fileencsha256_.Get();
+  return _impl_.fileencsha256_.Get();
 }
 inline void StickerMessage::_internal_set_fileencsha256(const std::string& value) {
-  _has_bits_[0] |= 0x00000004u;
-  fileencsha256_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.fileencsha256_.Set(value, GetArenaForAllocation());
 }
 inline std::string* StickerMessage::_internal_mutable_fileencsha256() {
-  _has_bits_[0] |= 0x00000004u;
-  return fileencsha256_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  return _impl_.fileencsha256_.Mutable(GetArenaForAllocation());
 }
 inline std::string* StickerMessage::release_fileencsha256() {
   // @@protoc_insertion_point(field_release:proto.StickerMessage.fileEncSha256)
   if (!_internal_has_fileencsha256()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000004u;
-  return fileencsha256_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  auto* p = _impl_.fileencsha256_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.fileencsha256_.IsDefault()) {
+    _impl_.fileencsha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void StickerMessage::set_allocated_fileencsha256(std::string* fileencsha256) {
   if (fileencsha256 != nullptr) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
+  }
+  _impl_.fileencsha256_.SetAllocated(fileencsha256, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.fileencsha256_.IsDefault()) {
+    _impl_.fileencsha256_.Set("", GetArenaForAllocation());
   }
-  fileencsha256_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), fileencsha256,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.StickerMessage.fileEncSha256)
 }
 
 // optional bytes mediaKey = 4;
 inline bool StickerMessage::_internal_has_mediakey() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool StickerMessage::has_mediakey() const {
   return _internal_has_mediakey();
 }
 inline void StickerMessage::clear_mediakey() {
-  mediakey_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.mediakey_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline const std::string& StickerMessage::mediakey() const {
   // @@protoc_insertion_point(field_get:proto.StickerMessage.mediaKey)
@@ -37199,8 +38815,8 @@ inline const std::string& StickerMessage::mediakey() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void StickerMessage::set_mediakey(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000008u;
- mediakey_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000008u;
+ _impl_.mediakey_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.StickerMessage.mediaKey)
 }
 inline std::string* StickerMessage::mutable_mediakey() {
@@ -37209,46 +38825,56 @@ inline std::string* StickerMessage::mutable_mediakey() {
   return _s;
 }
 inline const std::string& StickerMessage::_internal_mediakey() const {
-  return mediakey_.Get();
+  return _impl_.mediakey_.Get();
 }
 inline void StickerMessage::_internal_set_mediakey(const std::string& value) {
-  _has_bits_[0] |= 0x00000008u;
-  mediakey_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.mediakey_.Set(value, GetArenaForAllocation());
 }
 inline std::string* StickerMessage::_internal_mutable_mediakey() {
-  _has_bits_[0] |= 0x00000008u;
-  return mediakey_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  return _impl_.mediakey_.Mutable(GetArenaForAllocation());
 }
 inline std::string* StickerMessage::release_mediakey() {
   // @@protoc_insertion_point(field_release:proto.StickerMessage.mediaKey)
   if (!_internal_has_mediakey()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000008u;
-  return mediakey_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  auto* p = _impl_.mediakey_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.mediakey_.IsDefault()) {
+    _impl_.mediakey_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void StickerMessage::set_allocated_mediakey(std::string* mediakey) {
   if (mediakey != nullptr) {
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
+  }
+  _impl_.mediakey_.SetAllocated(mediakey, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.mediakey_.IsDefault()) {
+    _impl_.mediakey_.Set("", GetArenaForAllocation());
   }
-  mediakey_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), mediakey,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.StickerMessage.mediaKey)
 }
 
 // optional string mimetype = 5;
 inline bool StickerMessage::_internal_has_mimetype() const {
-  bool value = (_has_bits_[0] & 0x00000010u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
   return value;
 }
 inline bool StickerMessage::has_mimetype() const {
   return _internal_has_mimetype();
 }
 inline void StickerMessage::clear_mimetype() {
-  mimetype_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000010u;
+  _impl_.mimetype_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000010u;
 }
 inline const std::string& StickerMessage::mimetype() const {
   // @@protoc_insertion_point(field_get:proto.StickerMessage.mimetype)
@@ -37257,8 +38883,8 @@ inline const std::string& StickerMessage::mimetype() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void StickerMessage::set_mimetype(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000010u;
- mimetype_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000010u;
+ _impl_.mimetype_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.StickerMessage.mimetype)
 }
 inline std::string* StickerMessage::mutable_mimetype() {
@@ -37267,102 +38893,112 @@ inline std::string* StickerMessage::mutable_mimetype() {
   return _s;
 }
 inline const std::string& StickerMessage::_internal_mimetype() const {
-  return mimetype_.Get();
+  return _impl_.mimetype_.Get();
 }
 inline void StickerMessage::_internal_set_mimetype(const std::string& value) {
-  _has_bits_[0] |= 0x00000010u;
-  mimetype_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  _impl_.mimetype_.Set(value, GetArenaForAllocation());
 }
 inline std::string* StickerMessage::_internal_mutable_mimetype() {
-  _has_bits_[0] |= 0x00000010u;
-  return mimetype_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  return _impl_.mimetype_.Mutable(GetArenaForAllocation());
 }
 inline std::string* StickerMessage::release_mimetype() {
   // @@protoc_insertion_point(field_release:proto.StickerMessage.mimetype)
   if (!_internal_has_mimetype()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000010u;
-  return mimetype_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000010u;
+  auto* p = _impl_.mimetype_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.mimetype_.IsDefault()) {
+    _impl_.mimetype_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void StickerMessage::set_allocated_mimetype(std::string* mimetype) {
   if (mimetype != nullptr) {
-    _has_bits_[0] |= 0x00000010u;
+    _impl_._has_bits_[0] |= 0x00000010u;
   } else {
-    _has_bits_[0] &= ~0x00000010u;
+    _impl_._has_bits_[0] &= ~0x00000010u;
+  }
+  _impl_.mimetype_.SetAllocated(mimetype, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.mimetype_.IsDefault()) {
+    _impl_.mimetype_.Set("", GetArenaForAllocation());
   }
-  mimetype_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), mimetype,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.StickerMessage.mimetype)
 }
 
 // optional uint32 height = 6;
 inline bool StickerMessage::_internal_has_height() const {
-  bool value = (_has_bits_[0] & 0x00000200u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000200u) != 0;
   return value;
 }
 inline bool StickerMessage::has_height() const {
   return _internal_has_height();
 }
 inline void StickerMessage::clear_height() {
-  height_ = 0u;
-  _has_bits_[0] &= ~0x00000200u;
+  _impl_.height_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000200u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 StickerMessage::_internal_height() const {
-  return height_;
+inline uint32_t StickerMessage::_internal_height() const {
+  return _impl_.height_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 StickerMessage::height() const {
+inline uint32_t StickerMessage::height() const {
   // @@protoc_insertion_point(field_get:proto.StickerMessage.height)
   return _internal_height();
 }
-inline void StickerMessage::_internal_set_height(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000200u;
-  height_ = value;
+inline void StickerMessage::_internal_set_height(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000200u;
+  _impl_.height_ = value;
 }
-inline void StickerMessage::set_height(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void StickerMessage::set_height(uint32_t value) {
   _internal_set_height(value);
   // @@protoc_insertion_point(field_set:proto.StickerMessage.height)
 }
 
 // optional uint32 width = 7;
 inline bool StickerMessage::_internal_has_width() const {
-  bool value = (_has_bits_[0] & 0x00000400u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000400u) != 0;
   return value;
 }
 inline bool StickerMessage::has_width() const {
   return _internal_has_width();
 }
 inline void StickerMessage::clear_width() {
-  width_ = 0u;
-  _has_bits_[0] &= ~0x00000400u;
+  _impl_.width_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000400u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 StickerMessage::_internal_width() const {
-  return width_;
+inline uint32_t StickerMessage::_internal_width() const {
+  return _impl_.width_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 StickerMessage::width() const {
+inline uint32_t StickerMessage::width() const {
   // @@protoc_insertion_point(field_get:proto.StickerMessage.width)
   return _internal_width();
 }
-inline void StickerMessage::_internal_set_width(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000400u;
-  width_ = value;
+inline void StickerMessage::_internal_set_width(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000400u;
+  _impl_.width_ = value;
 }
-inline void StickerMessage::set_width(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void StickerMessage::set_width(uint32_t value) {
   _internal_set_width(value);
   // @@protoc_insertion_point(field_set:proto.StickerMessage.width)
 }
 
 // optional string directPath = 8;
 inline bool StickerMessage::_internal_has_directpath() const {
-  bool value = (_has_bits_[0] & 0x00000020u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
   return value;
 }
 inline bool StickerMessage::has_directpath() const {
   return _internal_has_directpath();
 }
 inline void StickerMessage::clear_directpath() {
-  directpath_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000020u;
+  _impl_.directpath_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000020u;
 }
 inline const std::string& StickerMessage::directpath() const {
   // @@protoc_insertion_point(field_get:proto.StickerMessage.directPath)
@@ -37371,8 +39007,8 @@ inline const std::string& StickerMessage::directpath() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void StickerMessage::set_directpath(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000020u;
- directpath_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000020u;
+ _impl_.directpath_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.StickerMessage.directPath)
 }
 inline std::string* StickerMessage::mutable_directpath() {
@@ -37381,130 +39017,140 @@ inline std::string* StickerMessage::mutable_directpath() {
   return _s;
 }
 inline const std::string& StickerMessage::_internal_directpath() const {
-  return directpath_.Get();
+  return _impl_.directpath_.Get();
 }
 inline void StickerMessage::_internal_set_directpath(const std::string& value) {
-  _has_bits_[0] |= 0x00000020u;
-  directpath_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000020u;
+  _impl_.directpath_.Set(value, GetArenaForAllocation());
 }
 inline std::string* StickerMessage::_internal_mutable_directpath() {
-  _has_bits_[0] |= 0x00000020u;
-  return directpath_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000020u;
+  return _impl_.directpath_.Mutable(GetArenaForAllocation());
 }
 inline std::string* StickerMessage::release_directpath() {
   // @@protoc_insertion_point(field_release:proto.StickerMessage.directPath)
   if (!_internal_has_directpath()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000020u;
-  return directpath_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000020u;
+  auto* p = _impl_.directpath_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.directpath_.IsDefault()) {
+    _impl_.directpath_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void StickerMessage::set_allocated_directpath(std::string* directpath) {
   if (directpath != nullptr) {
-    _has_bits_[0] |= 0x00000020u;
+    _impl_._has_bits_[0] |= 0x00000020u;
   } else {
-    _has_bits_[0] &= ~0x00000020u;
+    _impl_._has_bits_[0] &= ~0x00000020u;
+  }
+  _impl_.directpath_.SetAllocated(directpath, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.directpath_.IsDefault()) {
+    _impl_.directpath_.Set("", GetArenaForAllocation());
   }
-  directpath_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), directpath,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.StickerMessage.directPath)
 }
 
 // optional uint64 fileLength = 9;
 inline bool StickerMessage::_internal_has_filelength() const {
-  bool value = (_has_bits_[0] & 0x00000800u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000800u) != 0;
   return value;
 }
 inline bool StickerMessage::has_filelength() const {
   return _internal_has_filelength();
 }
 inline void StickerMessage::clear_filelength() {
-  filelength_ = uint64_t{0u};
-  _has_bits_[0] &= ~0x00000800u;
+  _impl_.filelength_ = uint64_t{0u};
+  _impl_._has_bits_[0] &= ~0x00000800u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 StickerMessage::_internal_filelength() const {
-  return filelength_;
+inline uint64_t StickerMessage::_internal_filelength() const {
+  return _impl_.filelength_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 StickerMessage::filelength() const {
+inline uint64_t StickerMessage::filelength() const {
   // @@protoc_insertion_point(field_get:proto.StickerMessage.fileLength)
   return _internal_filelength();
 }
-inline void StickerMessage::_internal_set_filelength(::PROTOBUF_NAMESPACE_ID::uint64 value) {
-  _has_bits_[0] |= 0x00000800u;
-  filelength_ = value;
+inline void StickerMessage::_internal_set_filelength(uint64_t value) {
+  _impl_._has_bits_[0] |= 0x00000800u;
+  _impl_.filelength_ = value;
 }
-inline void StickerMessage::set_filelength(::PROTOBUF_NAMESPACE_ID::uint64 value) {
+inline void StickerMessage::set_filelength(uint64_t value) {
   _internal_set_filelength(value);
   // @@protoc_insertion_point(field_set:proto.StickerMessage.fileLength)
 }
 
 // optional int64 mediaKeyTimestamp = 10;
 inline bool StickerMessage::_internal_has_mediakeytimestamp() const {
-  bool value = (_has_bits_[0] & 0x00001000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00001000u) != 0;
   return value;
 }
 inline bool StickerMessage::has_mediakeytimestamp() const {
   return _internal_has_mediakeytimestamp();
 }
 inline void StickerMessage::clear_mediakeytimestamp() {
-  mediakeytimestamp_ = int64_t{0};
-  _has_bits_[0] &= ~0x00001000u;
+  _impl_.mediakeytimestamp_ = int64_t{0};
+  _impl_._has_bits_[0] &= ~0x00001000u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 StickerMessage::_internal_mediakeytimestamp() const {
-  return mediakeytimestamp_;
+inline int64_t StickerMessage::_internal_mediakeytimestamp() const {
+  return _impl_.mediakeytimestamp_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 StickerMessage::mediakeytimestamp() const {
+inline int64_t StickerMessage::mediakeytimestamp() const {
   // @@protoc_insertion_point(field_get:proto.StickerMessage.mediaKeyTimestamp)
   return _internal_mediakeytimestamp();
 }
-inline void StickerMessage::_internal_set_mediakeytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value) {
-  _has_bits_[0] |= 0x00001000u;
-  mediakeytimestamp_ = value;
+inline void StickerMessage::_internal_set_mediakeytimestamp(int64_t value) {
+  _impl_._has_bits_[0] |= 0x00001000u;
+  _impl_.mediakeytimestamp_ = value;
 }
-inline void StickerMessage::set_mediakeytimestamp(::PROTOBUF_NAMESPACE_ID::int64 value) {
+inline void StickerMessage::set_mediakeytimestamp(int64_t value) {
   _internal_set_mediakeytimestamp(value);
   // @@protoc_insertion_point(field_set:proto.StickerMessage.mediaKeyTimestamp)
 }
 
 // optional uint32 firstFrameLength = 11;
 inline bool StickerMessage::_internal_has_firstframelength() const {
-  bool value = (_has_bits_[0] & 0x00002000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00002000u) != 0;
   return value;
 }
 inline bool StickerMessage::has_firstframelength() const {
   return _internal_has_firstframelength();
 }
 inline void StickerMessage::clear_firstframelength() {
-  firstframelength_ = 0u;
-  _has_bits_[0] &= ~0x00002000u;
+  _impl_.firstframelength_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00002000u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 StickerMessage::_internal_firstframelength() const {
-  return firstframelength_;
+inline uint32_t StickerMessage::_internal_firstframelength() const {
+  return _impl_.firstframelength_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 StickerMessage::firstframelength() const {
+inline uint32_t StickerMessage::firstframelength() const {
   // @@protoc_insertion_point(field_get:proto.StickerMessage.firstFrameLength)
   return _internal_firstframelength();
 }
-inline void StickerMessage::_internal_set_firstframelength(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00002000u;
-  firstframelength_ = value;
+inline void StickerMessage::_internal_set_firstframelength(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00002000u;
+  _impl_.firstframelength_ = value;
 }
-inline void StickerMessage::set_firstframelength(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void StickerMessage::set_firstframelength(uint32_t value) {
   _internal_set_firstframelength(value);
   // @@protoc_insertion_point(field_set:proto.StickerMessage.firstFrameLength)
 }
 
 // optional bytes firstFrameSidecar = 12;
 inline bool StickerMessage::_internal_has_firstframesidecar() const {
-  bool value = (_has_bits_[0] & 0x00000040u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
   return value;
 }
 inline bool StickerMessage::has_firstframesidecar() const {
   return _internal_has_firstframesidecar();
 }
 inline void StickerMessage::clear_firstframesidecar() {
-  firstframesidecar_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000040u;
+  _impl_.firstframesidecar_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000040u;
 }
 inline const std::string& StickerMessage::firstframesidecar() const {
   // @@protoc_insertion_point(field_get:proto.StickerMessage.firstFrameSidecar)
@@ -37513,8 +39159,8 @@ inline const std::string& StickerMessage::firstframesidecar() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void StickerMessage::set_firstframesidecar(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000040u;
- firstframesidecar_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000040u;
+ _impl_.firstframesidecar_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.StickerMessage.firstFrameSidecar)
 }
 inline std::string* StickerMessage::mutable_firstframesidecar() {
@@ -37523,57 +39169,67 @@ inline std::string* StickerMessage::mutable_firstframesidecar() {
   return _s;
 }
 inline const std::string& StickerMessage::_internal_firstframesidecar() const {
-  return firstframesidecar_.Get();
+  return _impl_.firstframesidecar_.Get();
 }
 inline void StickerMessage::_internal_set_firstframesidecar(const std::string& value) {
-  _has_bits_[0] |= 0x00000040u;
-  firstframesidecar_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000040u;
+  _impl_.firstframesidecar_.Set(value, GetArenaForAllocation());
 }
 inline std::string* StickerMessage::_internal_mutable_firstframesidecar() {
-  _has_bits_[0] |= 0x00000040u;
-  return firstframesidecar_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000040u;
+  return _impl_.firstframesidecar_.Mutable(GetArenaForAllocation());
 }
 inline std::string* StickerMessage::release_firstframesidecar() {
   // @@protoc_insertion_point(field_release:proto.StickerMessage.firstFrameSidecar)
   if (!_internal_has_firstframesidecar()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000040u;
-  return firstframesidecar_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000040u;
+  auto* p = _impl_.firstframesidecar_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.firstframesidecar_.IsDefault()) {
+    _impl_.firstframesidecar_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void StickerMessage::set_allocated_firstframesidecar(std::string* firstframesidecar) {
   if (firstframesidecar != nullptr) {
-    _has_bits_[0] |= 0x00000040u;
+    _impl_._has_bits_[0] |= 0x00000040u;
   } else {
-    _has_bits_[0] &= ~0x00000040u;
+    _impl_._has_bits_[0] &= ~0x00000040u;
   }
-  firstframesidecar_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), firstframesidecar,
-      GetArenaForAllocation());
+  _impl_.firstframesidecar_.SetAllocated(firstframesidecar, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.firstframesidecar_.IsDefault()) {
+    _impl_.firstframesidecar_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.StickerMessage.firstFrameSidecar)
 }
 
 // optional bool isAnimated = 13;
 inline bool StickerMessage::_internal_has_isanimated() const {
-  bool value = (_has_bits_[0] & 0x00004000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00004000u) != 0;
   return value;
 }
 inline bool StickerMessage::has_isanimated() const {
   return _internal_has_isanimated();
 }
 inline void StickerMessage::clear_isanimated() {
-  isanimated_ = false;
-  _has_bits_[0] &= ~0x00004000u;
+  _impl_.isanimated_ = false;
+  _impl_._has_bits_[0] &= ~0x00004000u;
 }
 inline bool StickerMessage::_internal_isanimated() const {
-  return isanimated_;
+  return _impl_.isanimated_;
 }
 inline bool StickerMessage::isanimated() const {
   // @@protoc_insertion_point(field_get:proto.StickerMessage.isAnimated)
   return _internal_isanimated();
 }
 inline void StickerMessage::_internal_set_isanimated(bool value) {
-  _has_bits_[0] |= 0x00004000u;
-  isanimated_ = value;
+  _impl_._has_bits_[0] |= 0x00004000u;
+  _impl_.isanimated_ = value;
 }
 inline void StickerMessage::set_isanimated(bool value) {
   _internal_set_isanimated(value);
@@ -37582,15 +39238,15 @@ inline void StickerMessage::set_isanimated(bool value) {
 
 // optional bytes pngThumbnail = 16;
 inline bool StickerMessage::_internal_has_pngthumbnail() const {
-  bool value = (_has_bits_[0] & 0x00000080u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000080u) != 0;
   return value;
 }
 inline bool StickerMessage::has_pngthumbnail() const {
   return _internal_has_pngthumbnail();
 }
 inline void StickerMessage::clear_pngthumbnail() {
-  pngthumbnail_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000080u;
+  _impl_.pngthumbnail_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000080u;
 }
 inline const std::string& StickerMessage::pngthumbnail() const {
   // @@protoc_insertion_point(field_get:proto.StickerMessage.pngThumbnail)
@@ -37599,8 +39255,8 @@ inline const std::string& StickerMessage::pngthumbnail() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void StickerMessage::set_pngthumbnail(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000080u;
- pngthumbnail_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000080u;
+ _impl_.pngthumbnail_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.StickerMessage.pngThumbnail)
 }
 inline std::string* StickerMessage::mutable_pngthumbnail() {
@@ -37609,50 +39265,60 @@ inline std::string* StickerMessage::mutable_pngthumbnail() {
   return _s;
 }
 inline const std::string& StickerMessage::_internal_pngthumbnail() const {
-  return pngthumbnail_.Get();
+  return _impl_.pngthumbnail_.Get();
 }
 inline void StickerMessage::_internal_set_pngthumbnail(const std::string& value) {
-  _has_bits_[0] |= 0x00000080u;
-  pngthumbnail_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000080u;
+  _impl_.pngthumbnail_.Set(value, GetArenaForAllocation());
 }
 inline std::string* StickerMessage::_internal_mutable_pngthumbnail() {
-  _has_bits_[0] |= 0x00000080u;
-  return pngthumbnail_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000080u;
+  return _impl_.pngthumbnail_.Mutable(GetArenaForAllocation());
 }
 inline std::string* StickerMessage::release_pngthumbnail() {
   // @@protoc_insertion_point(field_release:proto.StickerMessage.pngThumbnail)
   if (!_internal_has_pngthumbnail()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000080u;
-  return pngthumbnail_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000080u;
+  auto* p = _impl_.pngthumbnail_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.pngthumbnail_.IsDefault()) {
+    _impl_.pngthumbnail_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void StickerMessage::set_allocated_pngthumbnail(std::string* pngthumbnail) {
   if (pngthumbnail != nullptr) {
-    _has_bits_[0] |= 0x00000080u;
+    _impl_._has_bits_[0] |= 0x00000080u;
   } else {
-    _has_bits_[0] &= ~0x00000080u;
+    _impl_._has_bits_[0] &= ~0x00000080u;
   }
-  pngthumbnail_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), pngthumbnail,
-      GetArenaForAllocation());
+  _impl_.pngthumbnail_.SetAllocated(pngthumbnail, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.pngthumbnail_.IsDefault()) {
+    _impl_.pngthumbnail_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.StickerMessage.pngThumbnail)
 }
 
 // optional .proto.ContextInfo contextInfo = 17;
 inline bool StickerMessage::_internal_has_contextinfo() const {
-  bool value = (_has_bits_[0] & 0x00000100u) != 0;
-  PROTOBUF_ASSUME(!value || contextinfo_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000100u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.contextinfo_ != nullptr);
   return value;
 }
 inline bool StickerMessage::has_contextinfo() const {
   return _internal_has_contextinfo();
 }
 inline void StickerMessage::clear_contextinfo() {
-  if (contextinfo_ != nullptr) contextinfo_->Clear();
-  _has_bits_[0] &= ~0x00000100u;
+  if (_impl_.contextinfo_ != nullptr) _impl_.contextinfo_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000100u;
 }
 inline const ::proto::ContextInfo& StickerMessage::_internal_contextinfo() const {
-  const ::proto::ContextInfo* p = contextinfo_;
+  const ::proto::ContextInfo* p = _impl_.contextinfo_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ContextInfo&>(
       ::proto::_ContextInfo_default_instance_);
 }
@@ -37663,20 +39329,20 @@ inline const ::proto::ContextInfo& StickerMessage::contextinfo() const {
 inline void StickerMessage::unsafe_arena_set_allocated_contextinfo(
     ::proto::ContextInfo* contextinfo) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(contextinfo_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.contextinfo_);
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   if (contextinfo) {
-    _has_bits_[0] |= 0x00000100u;
+    _impl_._has_bits_[0] |= 0x00000100u;
   } else {
-    _has_bits_[0] &= ~0x00000100u;
+    _impl_._has_bits_[0] &= ~0x00000100u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.StickerMessage.contextInfo)
 }
 inline ::proto::ContextInfo* StickerMessage::release_contextinfo() {
-  _has_bits_[0] &= ~0x00000100u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000100u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -37690,18 +39356,18 @@ inline ::proto::ContextInfo* StickerMessage::release_contextinfo() {
 }
 inline ::proto::ContextInfo* StickerMessage::unsafe_arena_release_contextinfo() {
   // @@protoc_insertion_point(field_release:proto.StickerMessage.contextInfo)
-  _has_bits_[0] &= ~0x00000100u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000100u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
   return temp;
 }
 inline ::proto::ContextInfo* StickerMessage::_internal_mutable_contextinfo() {
-  _has_bits_[0] |= 0x00000100u;
-  if (contextinfo_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000100u;
+  if (_impl_.contextinfo_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ContextInfo>(GetArenaForAllocation());
-    contextinfo_ = p;
+    _impl_.contextinfo_ = p;
   }
-  return contextinfo_;
+  return _impl_.contextinfo_;
 }
 inline ::proto::ContextInfo* StickerMessage::mutable_contextinfo() {
   ::proto::ContextInfo* _msg = _internal_mutable_contextinfo();
@@ -37711,20 +39377,20 @@ inline ::proto::ContextInfo* StickerMessage::mutable_contextinfo() {
 inline void StickerMessage::set_allocated_contextinfo(::proto::ContextInfo* contextinfo) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete contextinfo_;
+    delete _impl_.contextinfo_;
   }
   if (contextinfo) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ContextInfo>::GetOwningArena(contextinfo);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(contextinfo);
     if (message_arena != submessage_arena) {
       contextinfo = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, contextinfo, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000100u;
+    _impl_._has_bits_[0] |= 0x00000100u;
   } else {
-    _has_bits_[0] &= ~0x00000100u;
+    _impl_._has_bits_[0] &= ~0x00000100u;
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   // @@protoc_insertion_point(field_set_allocated:proto.StickerMessage.contextInfo)
 }
 
@@ -37734,19 +39400,19 @@ inline void StickerMessage::set_allocated_contextinfo(::proto::ContextInfo* cont
 
 // optional .proto.HighlyStructuredMessage content = 6;
 inline bool FourRowTemplate::_internal_has_content() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || content_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.content_ != nullptr);
   return value;
 }
 inline bool FourRowTemplate::has_content() const {
   return _internal_has_content();
 }
 inline void FourRowTemplate::clear_content() {
-  if (content_ != nullptr) content_->Clear();
-  _has_bits_[0] &= ~0x00000001u;
+  if (_impl_.content_ != nullptr) _impl_.content_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const ::proto::HighlyStructuredMessage& FourRowTemplate::_internal_content() const {
-  const ::proto::HighlyStructuredMessage* p = content_;
+  const ::proto::HighlyStructuredMessage* p = _impl_.content_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::HighlyStructuredMessage&>(
       ::proto::_HighlyStructuredMessage_default_instance_);
 }
@@ -37757,20 +39423,20 @@ inline const ::proto::HighlyStructuredMessage& FourRowTemplate::content() const
 inline void FourRowTemplate::unsafe_arena_set_allocated_content(
     ::proto::HighlyStructuredMessage* content) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(content_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.content_);
   }
-  content_ = content;
+  _impl_.content_ = content;
   if (content) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.FourRowTemplate.content)
 }
 inline ::proto::HighlyStructuredMessage* FourRowTemplate::release_content() {
-  _has_bits_[0] &= ~0x00000001u;
-  ::proto::HighlyStructuredMessage* temp = content_;
-  content_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  ::proto::HighlyStructuredMessage* temp = _impl_.content_;
+  _impl_.content_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -37784,18 +39450,18 @@ inline ::proto::HighlyStructuredMessage* FourRowTemplate::release_content() {
 }
 inline ::proto::HighlyStructuredMessage* FourRowTemplate::unsafe_arena_release_content() {
   // @@protoc_insertion_point(field_release:proto.FourRowTemplate.content)
-  _has_bits_[0] &= ~0x00000001u;
-  ::proto::HighlyStructuredMessage* temp = content_;
-  content_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  ::proto::HighlyStructuredMessage* temp = _impl_.content_;
+  _impl_.content_ = nullptr;
   return temp;
 }
 inline ::proto::HighlyStructuredMessage* FourRowTemplate::_internal_mutable_content() {
-  _has_bits_[0] |= 0x00000001u;
-  if (content_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000001u;
+  if (_impl_.content_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::HighlyStructuredMessage>(GetArenaForAllocation());
-    content_ = p;
+    _impl_.content_ = p;
   }
-  return content_;
+  return _impl_.content_;
 }
 inline ::proto::HighlyStructuredMessage* FourRowTemplate::mutable_content() {
   ::proto::HighlyStructuredMessage* _msg = _internal_mutable_content();
@@ -37805,38 +39471,38 @@ inline ::proto::HighlyStructuredMessage* FourRowTemplate::mutable_content() {
 inline void FourRowTemplate::set_allocated_content(::proto::HighlyStructuredMessage* content) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete content_;
+    delete _impl_.content_;
   }
   if (content) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::HighlyStructuredMessage>::GetOwningArena(content);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(content);
     if (message_arena != submessage_arena) {
       content = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, content, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  content_ = content;
+  _impl_.content_ = content;
   // @@protoc_insertion_point(field_set_allocated:proto.FourRowTemplate.content)
 }
 
 // optional .proto.HighlyStructuredMessage footer = 7;
 inline bool FourRowTemplate::_internal_has_footer() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || footer_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.footer_ != nullptr);
   return value;
 }
 inline bool FourRowTemplate::has_footer() const {
   return _internal_has_footer();
 }
 inline void FourRowTemplate::clear_footer() {
-  if (footer_ != nullptr) footer_->Clear();
-  _has_bits_[0] &= ~0x00000002u;
+  if (_impl_.footer_ != nullptr) _impl_.footer_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const ::proto::HighlyStructuredMessage& FourRowTemplate::_internal_footer() const {
-  const ::proto::HighlyStructuredMessage* p = footer_;
+  const ::proto::HighlyStructuredMessage* p = _impl_.footer_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::HighlyStructuredMessage&>(
       ::proto::_HighlyStructuredMessage_default_instance_);
 }
@@ -37847,20 +39513,20 @@ inline const ::proto::HighlyStructuredMessage& FourRowTemplate::footer() const {
 inline void FourRowTemplate::unsafe_arena_set_allocated_footer(
     ::proto::HighlyStructuredMessage* footer) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(footer_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.footer_);
   }
-  footer_ = footer;
+  _impl_.footer_ = footer;
   if (footer) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.FourRowTemplate.footer)
 }
 inline ::proto::HighlyStructuredMessage* FourRowTemplate::release_footer() {
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::HighlyStructuredMessage* temp = footer_;
-  footer_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::HighlyStructuredMessage* temp = _impl_.footer_;
+  _impl_.footer_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -37874,18 +39540,18 @@ inline ::proto::HighlyStructuredMessage* FourRowTemplate::release_footer() {
 }
 inline ::proto::HighlyStructuredMessage* FourRowTemplate::unsafe_arena_release_footer() {
   // @@protoc_insertion_point(field_release:proto.FourRowTemplate.footer)
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::HighlyStructuredMessage* temp = footer_;
-  footer_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::HighlyStructuredMessage* temp = _impl_.footer_;
+  _impl_.footer_ = nullptr;
   return temp;
 }
 inline ::proto::HighlyStructuredMessage* FourRowTemplate::_internal_mutable_footer() {
-  _has_bits_[0] |= 0x00000002u;
-  if (footer_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000002u;
+  if (_impl_.footer_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::HighlyStructuredMessage>(GetArenaForAllocation());
-    footer_ = p;
+    _impl_.footer_ = p;
   }
-  return footer_;
+  return _impl_.footer_;
 }
 inline ::proto::HighlyStructuredMessage* FourRowTemplate::mutable_footer() {
   ::proto::HighlyStructuredMessage* _msg = _internal_mutable_footer();
@@ -37895,51 +39561,51 @@ inline ::proto::HighlyStructuredMessage* FourRowTemplate::mutable_footer() {
 inline void FourRowTemplate::set_allocated_footer(::proto::HighlyStructuredMessage* footer) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete footer_;
+    delete _impl_.footer_;
   }
   if (footer) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::HighlyStructuredMessage>::GetOwningArena(footer);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(footer);
     if (message_arena != submessage_arena) {
       footer = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, footer, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  footer_ = footer;
+  _impl_.footer_ = footer;
   // @@protoc_insertion_point(field_set_allocated:proto.FourRowTemplate.footer)
 }
 
 // repeated .proto.TemplateButton buttons = 8;
 inline int FourRowTemplate::_internal_buttons_size() const {
-  return buttons_.size();
+  return _impl_.buttons_.size();
 }
 inline int FourRowTemplate::buttons_size() const {
   return _internal_buttons_size();
 }
 inline void FourRowTemplate::clear_buttons() {
-  buttons_.Clear();
+  _impl_.buttons_.Clear();
 }
 inline ::proto::TemplateButton* FourRowTemplate::mutable_buttons(int index) {
   // @@protoc_insertion_point(field_mutable:proto.FourRowTemplate.buttons)
-  return buttons_.Mutable(index);
+  return _impl_.buttons_.Mutable(index);
 }
 inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::TemplateButton >*
 FourRowTemplate::mutable_buttons() {
   // @@protoc_insertion_point(field_mutable_list:proto.FourRowTemplate.buttons)
-  return &buttons_;
+  return &_impl_.buttons_;
 }
 inline const ::proto::TemplateButton& FourRowTemplate::_internal_buttons(int index) const {
-  return buttons_.Get(index);
+  return _impl_.buttons_.Get(index);
 }
 inline const ::proto::TemplateButton& FourRowTemplate::buttons(int index) const {
   // @@protoc_insertion_point(field_get:proto.FourRowTemplate.buttons)
   return _internal_buttons(index);
 }
 inline ::proto::TemplateButton* FourRowTemplate::_internal_add_buttons() {
-  return buttons_.Add();
+  return _impl_.buttons_.Add();
 }
 inline ::proto::TemplateButton* FourRowTemplate::add_buttons() {
   ::proto::TemplateButton* _add = _internal_add_buttons();
@@ -37949,7 +39615,7 @@ inline ::proto::TemplateButton* FourRowTemplate::add_buttons() {
 inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::TemplateButton >&
 FourRowTemplate::buttons() const {
   // @@protoc_insertion_point(field_list:proto.FourRowTemplate.buttons)
-  return buttons_;
+  return _impl_.buttons_;
 }
 
 // .proto.DocumentMessage documentMessage = 1;
@@ -37960,12 +39626,12 @@ inline bool FourRowTemplate::has_documentmessage() const {
   return _internal_has_documentmessage();
 }
 inline void FourRowTemplate::set_has_documentmessage() {
-  _oneof_case_[0] = kDocumentMessage;
+  _impl_._oneof_case_[0] = kDocumentMessage;
 }
 inline void FourRowTemplate::clear_documentmessage() {
   if (_internal_has_documentmessage()) {
     if (GetArenaForAllocation() == nullptr) {
-      delete title_.documentmessage_;
+      delete _impl_.title_.documentmessage_;
     }
     clear_has_title();
   }
@@ -37974,11 +39640,11 @@ inline ::proto::DocumentMessage* FourRowTemplate::release_documentmessage() {
   // @@protoc_insertion_point(field_release:proto.FourRowTemplate.documentMessage)
   if (_internal_has_documentmessage()) {
     clear_has_title();
-      ::proto::DocumentMessage* temp = title_.documentmessage_;
+    ::proto::DocumentMessage* temp = _impl_.title_.documentmessage_;
     if (GetArenaForAllocation() != nullptr) {
       temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
     }
-    title_.documentmessage_ = nullptr;
+    _impl_.title_.documentmessage_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -37986,7 +39652,7 @@ inline ::proto::DocumentMessage* FourRowTemplate::release_documentmessage() {
 }
 inline const ::proto::DocumentMessage& FourRowTemplate::_internal_documentmessage() const {
   return _internal_has_documentmessage()
-      ? *title_.documentmessage_
+      ? *_impl_.title_.documentmessage_
       : reinterpret_cast< ::proto::DocumentMessage&>(::proto::_DocumentMessage_default_instance_);
 }
 inline const ::proto::DocumentMessage& FourRowTemplate::documentmessage() const {
@@ -37997,8 +39663,8 @@ inline ::proto::DocumentMessage* FourRowTemplate::unsafe_arena_release_documentm
   // @@protoc_insertion_point(field_unsafe_arena_release:proto.FourRowTemplate.documentMessage)
   if (_internal_has_documentmessage()) {
     clear_has_title();
-    ::proto::DocumentMessage* temp = title_.documentmessage_;
-    title_.documentmessage_ = nullptr;
+    ::proto::DocumentMessage* temp = _impl_.title_.documentmessage_;
+    _impl_.title_.documentmessage_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -38008,7 +39674,7 @@ inline void FourRowTemplate::unsafe_arena_set_allocated_documentmessage(::proto:
   clear_title();
   if (documentmessage) {
     set_has_documentmessage();
-    title_.documentmessage_ = documentmessage;
+    _impl_.title_.documentmessage_ = documentmessage;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.FourRowTemplate.documentMessage)
 }
@@ -38016,9 +39682,9 @@ inline ::proto::DocumentMessage* FourRowTemplate::_internal_mutable_documentmess
   if (!_internal_has_documentmessage()) {
     clear_title();
     set_has_documentmessage();
-    title_.documentmessage_ = CreateMaybeMessage< ::proto::DocumentMessage >(GetArenaForAllocation());
+    _impl_.title_.documentmessage_ = CreateMaybeMessage< ::proto::DocumentMessage >(GetArenaForAllocation());
   }
-  return title_.documentmessage_;
+  return _impl_.title_.documentmessage_;
 }
 inline ::proto::DocumentMessage* FourRowTemplate::mutable_documentmessage() {
   ::proto::DocumentMessage* _msg = _internal_mutable_documentmessage();
@@ -38034,12 +39700,12 @@ inline bool FourRowTemplate::has_highlystructuredmessage() const {
   return _internal_has_highlystructuredmessage();
 }
 inline void FourRowTemplate::set_has_highlystructuredmessage() {
-  _oneof_case_[0] = kHighlyStructuredMessage;
+  _impl_._oneof_case_[0] = kHighlyStructuredMessage;
 }
 inline void FourRowTemplate::clear_highlystructuredmessage() {
   if (_internal_has_highlystructuredmessage()) {
     if (GetArenaForAllocation() == nullptr) {
-      delete title_.highlystructuredmessage_;
+      delete _impl_.title_.highlystructuredmessage_;
     }
     clear_has_title();
   }
@@ -38048,11 +39714,11 @@ inline ::proto::HighlyStructuredMessage* FourRowTemplate::release_highlystructur
   // @@protoc_insertion_point(field_release:proto.FourRowTemplate.highlyStructuredMessage)
   if (_internal_has_highlystructuredmessage()) {
     clear_has_title();
-      ::proto::HighlyStructuredMessage* temp = title_.highlystructuredmessage_;
+    ::proto::HighlyStructuredMessage* temp = _impl_.title_.highlystructuredmessage_;
     if (GetArenaForAllocation() != nullptr) {
       temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
     }
-    title_.highlystructuredmessage_ = nullptr;
+    _impl_.title_.highlystructuredmessage_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -38060,7 +39726,7 @@ inline ::proto::HighlyStructuredMessage* FourRowTemplate::release_highlystructur
 }
 inline const ::proto::HighlyStructuredMessage& FourRowTemplate::_internal_highlystructuredmessage() const {
   return _internal_has_highlystructuredmessage()
-      ? *title_.highlystructuredmessage_
+      ? *_impl_.title_.highlystructuredmessage_
       : reinterpret_cast< ::proto::HighlyStructuredMessage&>(::proto::_HighlyStructuredMessage_default_instance_);
 }
 inline const ::proto::HighlyStructuredMessage& FourRowTemplate::highlystructuredmessage() const {
@@ -38071,8 +39737,8 @@ inline ::proto::HighlyStructuredMessage* FourRowTemplate::unsafe_arena_release_h
   // @@protoc_insertion_point(field_unsafe_arena_release:proto.FourRowTemplate.highlyStructuredMessage)
   if (_internal_has_highlystructuredmessage()) {
     clear_has_title();
-    ::proto::HighlyStructuredMessage* temp = title_.highlystructuredmessage_;
-    title_.highlystructuredmessage_ = nullptr;
+    ::proto::HighlyStructuredMessage* temp = _impl_.title_.highlystructuredmessage_;
+    _impl_.title_.highlystructuredmessage_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -38082,7 +39748,7 @@ inline void FourRowTemplate::unsafe_arena_set_allocated_highlystructuredmessage(
   clear_title();
   if (highlystructuredmessage) {
     set_has_highlystructuredmessage();
-    title_.highlystructuredmessage_ = highlystructuredmessage;
+    _impl_.title_.highlystructuredmessage_ = highlystructuredmessage;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.FourRowTemplate.highlyStructuredMessage)
 }
@@ -38090,9 +39756,9 @@ inline ::proto::HighlyStructuredMessage* FourRowTemplate::_internal_mutable_high
   if (!_internal_has_highlystructuredmessage()) {
     clear_title();
     set_has_highlystructuredmessage();
-    title_.highlystructuredmessage_ = CreateMaybeMessage< ::proto::HighlyStructuredMessage >(GetArenaForAllocation());
+    _impl_.title_.highlystructuredmessage_ = CreateMaybeMessage< ::proto::HighlyStructuredMessage >(GetArenaForAllocation());
   }
-  return title_.highlystructuredmessage_;
+  return _impl_.title_.highlystructuredmessage_;
 }
 inline ::proto::HighlyStructuredMessage* FourRowTemplate::mutable_highlystructuredmessage() {
   ::proto::HighlyStructuredMessage* _msg = _internal_mutable_highlystructuredmessage();
@@ -38108,12 +39774,12 @@ inline bool FourRowTemplate::has_imagemessage() const {
   return _internal_has_imagemessage();
 }
 inline void FourRowTemplate::set_has_imagemessage() {
-  _oneof_case_[0] = kImageMessage;
+  _impl_._oneof_case_[0] = kImageMessage;
 }
 inline void FourRowTemplate::clear_imagemessage() {
   if (_internal_has_imagemessage()) {
     if (GetArenaForAllocation() == nullptr) {
-      delete title_.imagemessage_;
+      delete _impl_.title_.imagemessage_;
     }
     clear_has_title();
   }
@@ -38122,11 +39788,11 @@ inline ::proto::ImageMessage* FourRowTemplate::release_imagemessage() {
   // @@protoc_insertion_point(field_release:proto.FourRowTemplate.imageMessage)
   if (_internal_has_imagemessage()) {
     clear_has_title();
-      ::proto::ImageMessage* temp = title_.imagemessage_;
+    ::proto::ImageMessage* temp = _impl_.title_.imagemessage_;
     if (GetArenaForAllocation() != nullptr) {
       temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
     }
-    title_.imagemessage_ = nullptr;
+    _impl_.title_.imagemessage_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -38134,7 +39800,7 @@ inline ::proto::ImageMessage* FourRowTemplate::release_imagemessage() {
 }
 inline const ::proto::ImageMessage& FourRowTemplate::_internal_imagemessage() const {
   return _internal_has_imagemessage()
-      ? *title_.imagemessage_
+      ? *_impl_.title_.imagemessage_
       : reinterpret_cast< ::proto::ImageMessage&>(::proto::_ImageMessage_default_instance_);
 }
 inline const ::proto::ImageMessage& FourRowTemplate::imagemessage() const {
@@ -38145,8 +39811,8 @@ inline ::proto::ImageMessage* FourRowTemplate::unsafe_arena_release_imagemessage
   // @@protoc_insertion_point(field_unsafe_arena_release:proto.FourRowTemplate.imageMessage)
   if (_internal_has_imagemessage()) {
     clear_has_title();
-    ::proto::ImageMessage* temp = title_.imagemessage_;
-    title_.imagemessage_ = nullptr;
+    ::proto::ImageMessage* temp = _impl_.title_.imagemessage_;
+    _impl_.title_.imagemessage_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -38156,7 +39822,7 @@ inline void FourRowTemplate::unsafe_arena_set_allocated_imagemessage(::proto::Im
   clear_title();
   if (imagemessage) {
     set_has_imagemessage();
-    title_.imagemessage_ = imagemessage;
+    _impl_.title_.imagemessage_ = imagemessage;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.FourRowTemplate.imageMessage)
 }
@@ -38164,9 +39830,9 @@ inline ::proto::ImageMessage* FourRowTemplate::_internal_mutable_imagemessage()
   if (!_internal_has_imagemessage()) {
     clear_title();
     set_has_imagemessage();
-    title_.imagemessage_ = CreateMaybeMessage< ::proto::ImageMessage >(GetArenaForAllocation());
+    _impl_.title_.imagemessage_ = CreateMaybeMessage< ::proto::ImageMessage >(GetArenaForAllocation());
   }
-  return title_.imagemessage_;
+  return _impl_.title_.imagemessage_;
 }
 inline ::proto::ImageMessage* FourRowTemplate::mutable_imagemessage() {
   ::proto::ImageMessage* _msg = _internal_mutable_imagemessage();
@@ -38182,12 +39848,12 @@ inline bool FourRowTemplate::has_videomessage() const {
   return _internal_has_videomessage();
 }
 inline void FourRowTemplate::set_has_videomessage() {
-  _oneof_case_[0] = kVideoMessage;
+  _impl_._oneof_case_[0] = kVideoMessage;
 }
 inline void FourRowTemplate::clear_videomessage() {
   if (_internal_has_videomessage()) {
     if (GetArenaForAllocation() == nullptr) {
-      delete title_.videomessage_;
+      delete _impl_.title_.videomessage_;
     }
     clear_has_title();
   }
@@ -38196,11 +39862,11 @@ inline ::proto::VideoMessage* FourRowTemplate::release_videomessage() {
   // @@protoc_insertion_point(field_release:proto.FourRowTemplate.videoMessage)
   if (_internal_has_videomessage()) {
     clear_has_title();
-      ::proto::VideoMessage* temp = title_.videomessage_;
+    ::proto::VideoMessage* temp = _impl_.title_.videomessage_;
     if (GetArenaForAllocation() != nullptr) {
       temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
     }
-    title_.videomessage_ = nullptr;
+    _impl_.title_.videomessage_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -38208,7 +39874,7 @@ inline ::proto::VideoMessage* FourRowTemplate::release_videomessage() {
 }
 inline const ::proto::VideoMessage& FourRowTemplate::_internal_videomessage() const {
   return _internal_has_videomessage()
-      ? *title_.videomessage_
+      ? *_impl_.title_.videomessage_
       : reinterpret_cast< ::proto::VideoMessage&>(::proto::_VideoMessage_default_instance_);
 }
 inline const ::proto::VideoMessage& FourRowTemplate::videomessage() const {
@@ -38219,8 +39885,8 @@ inline ::proto::VideoMessage* FourRowTemplate::unsafe_arena_release_videomessage
   // @@protoc_insertion_point(field_unsafe_arena_release:proto.FourRowTemplate.videoMessage)
   if (_internal_has_videomessage()) {
     clear_has_title();
-    ::proto::VideoMessage* temp = title_.videomessage_;
-    title_.videomessage_ = nullptr;
+    ::proto::VideoMessage* temp = _impl_.title_.videomessage_;
+    _impl_.title_.videomessage_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -38230,7 +39896,7 @@ inline void FourRowTemplate::unsafe_arena_set_allocated_videomessage(::proto::Vi
   clear_title();
   if (videomessage) {
     set_has_videomessage();
-    title_.videomessage_ = videomessage;
+    _impl_.title_.videomessage_ = videomessage;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.FourRowTemplate.videoMessage)
 }
@@ -38238,9 +39904,9 @@ inline ::proto::VideoMessage* FourRowTemplate::_internal_mutable_videomessage()
   if (!_internal_has_videomessage()) {
     clear_title();
     set_has_videomessage();
-    title_.videomessage_ = CreateMaybeMessage< ::proto::VideoMessage >(GetArenaForAllocation());
+    _impl_.title_.videomessage_ = CreateMaybeMessage< ::proto::VideoMessage >(GetArenaForAllocation());
   }
-  return title_.videomessage_;
+  return _impl_.title_.videomessage_;
 }
 inline ::proto::VideoMessage* FourRowTemplate::mutable_videomessage() {
   ::proto::VideoMessage* _msg = _internal_mutable_videomessage();
@@ -38256,12 +39922,12 @@ inline bool FourRowTemplate::has_locationmessage() const {
   return _internal_has_locationmessage();
 }
 inline void FourRowTemplate::set_has_locationmessage() {
-  _oneof_case_[0] = kLocationMessage;
+  _impl_._oneof_case_[0] = kLocationMessage;
 }
 inline void FourRowTemplate::clear_locationmessage() {
   if (_internal_has_locationmessage()) {
     if (GetArenaForAllocation() == nullptr) {
-      delete title_.locationmessage_;
+      delete _impl_.title_.locationmessage_;
     }
     clear_has_title();
   }
@@ -38270,11 +39936,11 @@ inline ::proto::LocationMessage* FourRowTemplate::release_locationmessage() {
   // @@protoc_insertion_point(field_release:proto.FourRowTemplate.locationMessage)
   if (_internal_has_locationmessage()) {
     clear_has_title();
-      ::proto::LocationMessage* temp = title_.locationmessage_;
+    ::proto::LocationMessage* temp = _impl_.title_.locationmessage_;
     if (GetArenaForAllocation() != nullptr) {
       temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
     }
-    title_.locationmessage_ = nullptr;
+    _impl_.title_.locationmessage_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -38282,7 +39948,7 @@ inline ::proto::LocationMessage* FourRowTemplate::release_locationmessage() {
 }
 inline const ::proto::LocationMessage& FourRowTemplate::_internal_locationmessage() const {
   return _internal_has_locationmessage()
-      ? *title_.locationmessage_
+      ? *_impl_.title_.locationmessage_
       : reinterpret_cast< ::proto::LocationMessage&>(::proto::_LocationMessage_default_instance_);
 }
 inline const ::proto::LocationMessage& FourRowTemplate::locationmessage() const {
@@ -38293,8 +39959,8 @@ inline ::proto::LocationMessage* FourRowTemplate::unsafe_arena_release_locationm
   // @@protoc_insertion_point(field_unsafe_arena_release:proto.FourRowTemplate.locationMessage)
   if (_internal_has_locationmessage()) {
     clear_has_title();
-    ::proto::LocationMessage* temp = title_.locationmessage_;
-    title_.locationmessage_ = nullptr;
+    ::proto::LocationMessage* temp = _impl_.title_.locationmessage_;
+    _impl_.title_.locationmessage_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -38304,7 +39970,7 @@ inline void FourRowTemplate::unsafe_arena_set_allocated_locationmessage(::proto:
   clear_title();
   if (locationmessage) {
     set_has_locationmessage();
-    title_.locationmessage_ = locationmessage;
+    _impl_.title_.locationmessage_ = locationmessage;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.FourRowTemplate.locationMessage)
 }
@@ -38312,9 +39978,9 @@ inline ::proto::LocationMessage* FourRowTemplate::_internal_mutable_locationmess
   if (!_internal_has_locationmessage()) {
     clear_title();
     set_has_locationmessage();
-    title_.locationmessage_ = CreateMaybeMessage< ::proto::LocationMessage >(GetArenaForAllocation());
+    _impl_.title_.locationmessage_ = CreateMaybeMessage< ::proto::LocationMessage >(GetArenaForAllocation());
   }
-  return title_.locationmessage_;
+  return _impl_.title_.locationmessage_;
 }
 inline ::proto::LocationMessage* FourRowTemplate::mutable_locationmessage() {
   ::proto::LocationMessage* _msg = _internal_mutable_locationmessage();
@@ -38326,10 +39992,10 @@ inline bool FourRowTemplate::has_title() const {
   return title_case() != TITLE_NOT_SET;
 }
 inline void FourRowTemplate::clear_has_title() {
-  _oneof_case_[0] = TITLE_NOT_SET;
+  _impl_._oneof_case_[0] = TITLE_NOT_SET;
 }
 inline FourRowTemplate::TitleCase FourRowTemplate::title_case() const {
-  return FourRowTemplate::TitleCase(_oneof_case_[0]);
+  return FourRowTemplate::TitleCase(_impl_._oneof_case_[0]);
 }
 // -------------------------------------------------------------------
 
@@ -38337,15 +40003,15 @@ inline FourRowTemplate::TitleCase FourRowTemplate::title_case() const {
 
 // optional string hydratedContentText = 6;
 inline bool HydratedFourRowTemplate::_internal_has_hydratedcontenttext() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool HydratedFourRowTemplate::has_hydratedcontenttext() const {
   return _internal_has_hydratedcontenttext();
 }
 inline void HydratedFourRowTemplate::clear_hydratedcontenttext() {
-  hydratedcontenttext_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.hydratedcontenttext_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& HydratedFourRowTemplate::hydratedcontenttext() const {
   // @@protoc_insertion_point(field_get:proto.HydratedFourRowTemplate.hydratedContentText)
@@ -38354,8 +40020,8 @@ inline const std::string& HydratedFourRowTemplate::hydratedcontenttext() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void HydratedFourRowTemplate::set_hydratedcontenttext(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- hydratedcontenttext_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.hydratedcontenttext_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.HydratedFourRowTemplate.hydratedContentText)
 }
 inline std::string* HydratedFourRowTemplate::mutable_hydratedcontenttext() {
@@ -38364,46 +40030,56 @@ inline std::string* HydratedFourRowTemplate::mutable_hydratedcontenttext() {
   return _s;
 }
 inline const std::string& HydratedFourRowTemplate::_internal_hydratedcontenttext() const {
-  return hydratedcontenttext_.Get();
+  return _impl_.hydratedcontenttext_.Get();
 }
 inline void HydratedFourRowTemplate::_internal_set_hydratedcontenttext(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  hydratedcontenttext_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.hydratedcontenttext_.Set(value, GetArenaForAllocation());
 }
 inline std::string* HydratedFourRowTemplate::_internal_mutable_hydratedcontenttext() {
-  _has_bits_[0] |= 0x00000001u;
-  return hydratedcontenttext_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.hydratedcontenttext_.Mutable(GetArenaForAllocation());
 }
 inline std::string* HydratedFourRowTemplate::release_hydratedcontenttext() {
   // @@protoc_insertion_point(field_release:proto.HydratedFourRowTemplate.hydratedContentText)
   if (!_internal_has_hydratedcontenttext()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return hydratedcontenttext_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.hydratedcontenttext_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.hydratedcontenttext_.IsDefault()) {
+    _impl_.hydratedcontenttext_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void HydratedFourRowTemplate::set_allocated_hydratedcontenttext(std::string* hydratedcontenttext) {
   if (hydratedcontenttext != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  hydratedcontenttext_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), hydratedcontenttext,
-      GetArenaForAllocation());
+  _impl_.hydratedcontenttext_.SetAllocated(hydratedcontenttext, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.hydratedcontenttext_.IsDefault()) {
+    _impl_.hydratedcontenttext_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.HydratedFourRowTemplate.hydratedContentText)
 }
 
 // optional string hydratedFooterText = 7;
 inline bool HydratedFourRowTemplate::_internal_has_hydratedfootertext() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool HydratedFourRowTemplate::has_hydratedfootertext() const {
   return _internal_has_hydratedfootertext();
 }
 inline void HydratedFourRowTemplate::clear_hydratedfootertext() {
-  hydratedfootertext_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.hydratedfootertext_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& HydratedFourRowTemplate::hydratedfootertext() const {
   // @@protoc_insertion_point(field_get:proto.HydratedFourRowTemplate.hydratedFooterText)
@@ -38412,8 +40088,8 @@ inline const std::string& HydratedFourRowTemplate::hydratedfootertext() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void HydratedFourRowTemplate::set_hydratedfootertext(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- hydratedfootertext_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.hydratedfootertext_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.HydratedFourRowTemplate.hydratedFooterText)
 }
 inline std::string* HydratedFourRowTemplate::mutable_hydratedfootertext() {
@@ -38422,63 +40098,73 @@ inline std::string* HydratedFourRowTemplate::mutable_hydratedfootertext() {
   return _s;
 }
 inline const std::string& HydratedFourRowTemplate::_internal_hydratedfootertext() const {
-  return hydratedfootertext_.Get();
+  return _impl_.hydratedfootertext_.Get();
 }
 inline void HydratedFourRowTemplate::_internal_set_hydratedfootertext(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  hydratedfootertext_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.hydratedfootertext_.Set(value, GetArenaForAllocation());
 }
 inline std::string* HydratedFourRowTemplate::_internal_mutable_hydratedfootertext() {
-  _has_bits_[0] |= 0x00000002u;
-  return hydratedfootertext_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.hydratedfootertext_.Mutable(GetArenaForAllocation());
 }
 inline std::string* HydratedFourRowTemplate::release_hydratedfootertext() {
   // @@protoc_insertion_point(field_release:proto.HydratedFourRowTemplate.hydratedFooterText)
   if (!_internal_has_hydratedfootertext()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return hydratedfootertext_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.hydratedfootertext_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.hydratedfootertext_.IsDefault()) {
+    _impl_.hydratedfootertext_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void HydratedFourRowTemplate::set_allocated_hydratedfootertext(std::string* hydratedfootertext) {
   if (hydratedfootertext != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  hydratedfootertext_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), hydratedfootertext,
-      GetArenaForAllocation());
+  _impl_.hydratedfootertext_.SetAllocated(hydratedfootertext, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.hydratedfootertext_.IsDefault()) {
+    _impl_.hydratedfootertext_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.HydratedFourRowTemplate.hydratedFooterText)
 }
 
 // repeated .proto.HydratedTemplateButton hydratedButtons = 8;
 inline int HydratedFourRowTemplate::_internal_hydratedbuttons_size() const {
-  return hydratedbuttons_.size();
+  return _impl_.hydratedbuttons_.size();
 }
 inline int HydratedFourRowTemplate::hydratedbuttons_size() const {
   return _internal_hydratedbuttons_size();
 }
 inline void HydratedFourRowTemplate::clear_hydratedbuttons() {
-  hydratedbuttons_.Clear();
+  _impl_.hydratedbuttons_.Clear();
 }
 inline ::proto::HydratedTemplateButton* HydratedFourRowTemplate::mutable_hydratedbuttons(int index) {
   // @@protoc_insertion_point(field_mutable:proto.HydratedFourRowTemplate.hydratedButtons)
-  return hydratedbuttons_.Mutable(index);
+  return _impl_.hydratedbuttons_.Mutable(index);
 }
 inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::HydratedTemplateButton >*
 HydratedFourRowTemplate::mutable_hydratedbuttons() {
   // @@protoc_insertion_point(field_mutable_list:proto.HydratedFourRowTemplate.hydratedButtons)
-  return &hydratedbuttons_;
+  return &_impl_.hydratedbuttons_;
 }
 inline const ::proto::HydratedTemplateButton& HydratedFourRowTemplate::_internal_hydratedbuttons(int index) const {
-  return hydratedbuttons_.Get(index);
+  return _impl_.hydratedbuttons_.Get(index);
 }
 inline const ::proto::HydratedTemplateButton& HydratedFourRowTemplate::hydratedbuttons(int index) const {
   // @@protoc_insertion_point(field_get:proto.HydratedFourRowTemplate.hydratedButtons)
   return _internal_hydratedbuttons(index);
 }
 inline ::proto::HydratedTemplateButton* HydratedFourRowTemplate::_internal_add_hydratedbuttons() {
-  return hydratedbuttons_.Add();
+  return _impl_.hydratedbuttons_.Add();
 }
 inline ::proto::HydratedTemplateButton* HydratedFourRowTemplate::add_hydratedbuttons() {
   ::proto::HydratedTemplateButton* _add = _internal_add_hydratedbuttons();
@@ -38488,20 +40174,20 @@ inline ::proto::HydratedTemplateButton* HydratedFourRowTemplate::add_hydratedbut
 inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::HydratedTemplateButton >&
 HydratedFourRowTemplate::hydratedbuttons() const {
   // @@protoc_insertion_point(field_list:proto.HydratedFourRowTemplate.hydratedButtons)
-  return hydratedbuttons_;
+  return _impl_.hydratedbuttons_;
 }
 
 // optional string templateId = 9;
 inline bool HydratedFourRowTemplate::_internal_has_templateid() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool HydratedFourRowTemplate::has_templateid() const {
   return _internal_has_templateid();
 }
 inline void HydratedFourRowTemplate::clear_templateid() {
-  templateid_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.templateid_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const std::string& HydratedFourRowTemplate::templateid() const {
   // @@protoc_insertion_point(field_get:proto.HydratedFourRowTemplate.templateId)
@@ -38510,8 +40196,8 @@ inline const std::string& HydratedFourRowTemplate::templateid() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void HydratedFourRowTemplate::set_templateid(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000004u;
- templateid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000004u;
+ _impl_.templateid_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.HydratedFourRowTemplate.templateId)
 }
 inline std::string* HydratedFourRowTemplate::mutable_templateid() {
@@ -38520,32 +40206,42 @@ inline std::string* HydratedFourRowTemplate::mutable_templateid() {
   return _s;
 }
 inline const std::string& HydratedFourRowTemplate::_internal_templateid() const {
-  return templateid_.Get();
+  return _impl_.templateid_.Get();
 }
 inline void HydratedFourRowTemplate::_internal_set_templateid(const std::string& value) {
-  _has_bits_[0] |= 0x00000004u;
-  templateid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.templateid_.Set(value, GetArenaForAllocation());
 }
 inline std::string* HydratedFourRowTemplate::_internal_mutable_templateid() {
-  _has_bits_[0] |= 0x00000004u;
-  return templateid_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  return _impl_.templateid_.Mutable(GetArenaForAllocation());
 }
 inline std::string* HydratedFourRowTemplate::release_templateid() {
   // @@protoc_insertion_point(field_release:proto.HydratedFourRowTemplate.templateId)
   if (!_internal_has_templateid()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000004u;
-  return templateid_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  auto* p = _impl_.templateid_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.templateid_.IsDefault()) {
+    _impl_.templateid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void HydratedFourRowTemplate::set_allocated_templateid(std::string* templateid) {
   if (templateid != nullptr) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
-  templateid_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), templateid,
-      GetArenaForAllocation());
+  _impl_.templateid_.SetAllocated(templateid, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.templateid_.IsDefault()) {
+    _impl_.templateid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.HydratedFourRowTemplate.templateId)
 }
 
@@ -38557,12 +40253,12 @@ inline bool HydratedFourRowTemplate::has_documentmessage() const {
   return _internal_has_documentmessage();
 }
 inline void HydratedFourRowTemplate::set_has_documentmessage() {
-  _oneof_case_[0] = kDocumentMessage;
+  _impl_._oneof_case_[0] = kDocumentMessage;
 }
 inline void HydratedFourRowTemplate::clear_documentmessage() {
   if (_internal_has_documentmessage()) {
     if (GetArenaForAllocation() == nullptr) {
-      delete title_.documentmessage_;
+      delete _impl_.title_.documentmessage_;
     }
     clear_has_title();
   }
@@ -38571,11 +40267,11 @@ inline ::proto::DocumentMessage* HydratedFourRowTemplate::release_documentmessag
   // @@protoc_insertion_point(field_release:proto.HydratedFourRowTemplate.documentMessage)
   if (_internal_has_documentmessage()) {
     clear_has_title();
-      ::proto::DocumentMessage* temp = title_.documentmessage_;
+    ::proto::DocumentMessage* temp = _impl_.title_.documentmessage_;
     if (GetArenaForAllocation() != nullptr) {
       temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
     }
-    title_.documentmessage_ = nullptr;
+    _impl_.title_.documentmessage_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -38583,7 +40279,7 @@ inline ::proto::DocumentMessage* HydratedFourRowTemplate::release_documentmessag
 }
 inline const ::proto::DocumentMessage& HydratedFourRowTemplate::_internal_documentmessage() const {
   return _internal_has_documentmessage()
-      ? *title_.documentmessage_
+      ? *_impl_.title_.documentmessage_
       : reinterpret_cast< ::proto::DocumentMessage&>(::proto::_DocumentMessage_default_instance_);
 }
 inline const ::proto::DocumentMessage& HydratedFourRowTemplate::documentmessage() const {
@@ -38594,8 +40290,8 @@ inline ::proto::DocumentMessage* HydratedFourRowTemplate::unsafe_arena_release_d
   // @@protoc_insertion_point(field_unsafe_arena_release:proto.HydratedFourRowTemplate.documentMessage)
   if (_internal_has_documentmessage()) {
     clear_has_title();
-    ::proto::DocumentMessage* temp = title_.documentmessage_;
-    title_.documentmessage_ = nullptr;
+    ::proto::DocumentMessage* temp = _impl_.title_.documentmessage_;
+    _impl_.title_.documentmessage_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -38605,7 +40301,7 @@ inline void HydratedFourRowTemplate::unsafe_arena_set_allocated_documentmessage(
   clear_title();
   if (documentmessage) {
     set_has_documentmessage();
-    title_.documentmessage_ = documentmessage;
+    _impl_.title_.documentmessage_ = documentmessage;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.HydratedFourRowTemplate.documentMessage)
 }
@@ -38613,9 +40309,9 @@ inline ::proto::DocumentMessage* HydratedFourRowTemplate::_internal_mutable_docu
   if (!_internal_has_documentmessage()) {
     clear_title();
     set_has_documentmessage();
-    title_.documentmessage_ = CreateMaybeMessage< ::proto::DocumentMessage >(GetArenaForAllocation());
+    _impl_.title_.documentmessage_ = CreateMaybeMessage< ::proto::DocumentMessage >(GetArenaForAllocation());
   }
-  return title_.documentmessage_;
+  return _impl_.title_.documentmessage_;
 }
 inline ::proto::DocumentMessage* HydratedFourRowTemplate::mutable_documentmessage() {
   ::proto::DocumentMessage* _msg = _internal_mutable_documentmessage();
@@ -38631,11 +40327,11 @@ inline bool HydratedFourRowTemplate::has_hydratedtitletext() const {
   return _internal_has_hydratedtitletext();
 }
 inline void HydratedFourRowTemplate::set_has_hydratedtitletext() {
-  _oneof_case_[0] = kHydratedTitleText;
+  _impl_._oneof_case_[0] = kHydratedTitleText;
 }
 inline void HydratedFourRowTemplate::clear_hydratedtitletext() {
   if (_internal_has_hydratedtitletext()) {
-    title_.hydratedtitletext_.Destroy(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+    _impl_.title_.hydratedtitletext_.Destroy();
     clear_has_title();
   }
 }
@@ -38648,9 +40344,9 @@ inline void HydratedFourRowTemplate::set_hydratedtitletext(ArgT0&& arg0, ArgT...
   if (!_internal_has_hydratedtitletext()) {
     clear_title();
     set_has_hydratedtitletext();
-    title_.hydratedtitletext_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+    _impl_.title_.hydratedtitletext_.InitDefault();
   }
-  title_.hydratedtitletext_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+  _impl_.title_.hydratedtitletext_.Set( static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.HydratedFourRowTemplate.hydratedTitleText)
 }
 inline std::string* HydratedFourRowTemplate::mutable_hydratedtitletext() {
@@ -38660,7 +40356,7 @@ inline std::string* HydratedFourRowTemplate::mutable_hydratedtitletext() {
 }
 inline const std::string& HydratedFourRowTemplate::_internal_hydratedtitletext() const {
   if (_internal_has_hydratedtitletext()) {
-    return title_.hydratedtitletext_.Get();
+    return _impl_.title_.hydratedtitletext_.Get();
   }
   return ::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited();
 }
@@ -38668,24 +40364,23 @@ inline void HydratedFourRowTemplate::_internal_set_hydratedtitletext(const std::
   if (!_internal_has_hydratedtitletext()) {
     clear_title();
     set_has_hydratedtitletext();
-    title_.hydratedtitletext_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+    _impl_.title_.hydratedtitletext_.InitDefault();
   }
-  title_.hydratedtitletext_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_.title_.hydratedtitletext_.Set(value, GetArenaForAllocation());
 }
 inline std::string* HydratedFourRowTemplate::_internal_mutable_hydratedtitletext() {
   if (!_internal_has_hydratedtitletext()) {
     clear_title();
     set_has_hydratedtitletext();
-    title_.hydratedtitletext_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+    _impl_.title_.hydratedtitletext_.InitDefault();
   }
-  return title_.hydratedtitletext_.Mutable(
-      ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  return _impl_.title_.hydratedtitletext_.Mutable(      GetArenaForAllocation());
 }
 inline std::string* HydratedFourRowTemplate::release_hydratedtitletext() {
   // @@protoc_insertion_point(field_release:proto.HydratedFourRowTemplate.hydratedTitleText)
   if (_internal_has_hydratedtitletext()) {
     clear_has_title();
-    return title_.hydratedtitletext_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+    return _impl_.title_.hydratedtitletext_.Release();
   } else {
     return nullptr;
   }
@@ -38696,11 +40391,7 @@ inline void HydratedFourRowTemplate::set_allocated_hydratedtitletext(std::string
   }
   if (hydratedtitletext != nullptr) {
     set_has_hydratedtitletext();
-    title_.hydratedtitletext_.UnsafeSetDefault(hydratedtitletext);
-    ::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaForAllocation();
-    if (arena != nullptr) {
-      arena->Own(hydratedtitletext);
-    }
+    _impl_.title_.hydratedtitletext_.InitAllocated(hydratedtitletext, GetArenaForAllocation());
   }
   // @@protoc_insertion_point(field_set_allocated:proto.HydratedFourRowTemplate.hydratedTitleText)
 }
@@ -38713,12 +40404,12 @@ inline bool HydratedFourRowTemplate::has_imagemessage() const {
   return _internal_has_imagemessage();
 }
 inline void HydratedFourRowTemplate::set_has_imagemessage() {
-  _oneof_case_[0] = kImageMessage;
+  _impl_._oneof_case_[0] = kImageMessage;
 }
 inline void HydratedFourRowTemplate::clear_imagemessage() {
   if (_internal_has_imagemessage()) {
     if (GetArenaForAllocation() == nullptr) {
-      delete title_.imagemessage_;
+      delete _impl_.title_.imagemessage_;
     }
     clear_has_title();
   }
@@ -38727,11 +40418,11 @@ inline ::proto::ImageMessage* HydratedFourRowTemplate::release_imagemessage() {
   // @@protoc_insertion_point(field_release:proto.HydratedFourRowTemplate.imageMessage)
   if (_internal_has_imagemessage()) {
     clear_has_title();
-      ::proto::ImageMessage* temp = title_.imagemessage_;
+    ::proto::ImageMessage* temp = _impl_.title_.imagemessage_;
     if (GetArenaForAllocation() != nullptr) {
       temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
     }
-    title_.imagemessage_ = nullptr;
+    _impl_.title_.imagemessage_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -38739,7 +40430,7 @@ inline ::proto::ImageMessage* HydratedFourRowTemplate::release_imagemessage() {
 }
 inline const ::proto::ImageMessage& HydratedFourRowTemplate::_internal_imagemessage() const {
   return _internal_has_imagemessage()
-      ? *title_.imagemessage_
+      ? *_impl_.title_.imagemessage_
       : reinterpret_cast< ::proto::ImageMessage&>(::proto::_ImageMessage_default_instance_);
 }
 inline const ::proto::ImageMessage& HydratedFourRowTemplate::imagemessage() const {
@@ -38750,8 +40441,8 @@ inline ::proto::ImageMessage* HydratedFourRowTemplate::unsafe_arena_release_imag
   // @@protoc_insertion_point(field_unsafe_arena_release:proto.HydratedFourRowTemplate.imageMessage)
   if (_internal_has_imagemessage()) {
     clear_has_title();
-    ::proto::ImageMessage* temp = title_.imagemessage_;
-    title_.imagemessage_ = nullptr;
+    ::proto::ImageMessage* temp = _impl_.title_.imagemessage_;
+    _impl_.title_.imagemessage_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -38761,7 +40452,7 @@ inline void HydratedFourRowTemplate::unsafe_arena_set_allocated_imagemessage(::p
   clear_title();
   if (imagemessage) {
     set_has_imagemessage();
-    title_.imagemessage_ = imagemessage;
+    _impl_.title_.imagemessage_ = imagemessage;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.HydratedFourRowTemplate.imageMessage)
 }
@@ -38769,9 +40460,9 @@ inline ::proto::ImageMessage* HydratedFourRowTemplate::_internal_mutable_imageme
   if (!_internal_has_imagemessage()) {
     clear_title();
     set_has_imagemessage();
-    title_.imagemessage_ = CreateMaybeMessage< ::proto::ImageMessage >(GetArenaForAllocation());
+    _impl_.title_.imagemessage_ = CreateMaybeMessage< ::proto::ImageMessage >(GetArenaForAllocation());
   }
-  return title_.imagemessage_;
+  return _impl_.title_.imagemessage_;
 }
 inline ::proto::ImageMessage* HydratedFourRowTemplate::mutable_imagemessage() {
   ::proto::ImageMessage* _msg = _internal_mutable_imagemessage();
@@ -38787,12 +40478,12 @@ inline bool HydratedFourRowTemplate::has_videomessage() const {
   return _internal_has_videomessage();
 }
 inline void HydratedFourRowTemplate::set_has_videomessage() {
-  _oneof_case_[0] = kVideoMessage;
+  _impl_._oneof_case_[0] = kVideoMessage;
 }
 inline void HydratedFourRowTemplate::clear_videomessage() {
   if (_internal_has_videomessage()) {
     if (GetArenaForAllocation() == nullptr) {
-      delete title_.videomessage_;
+      delete _impl_.title_.videomessage_;
     }
     clear_has_title();
   }
@@ -38801,11 +40492,11 @@ inline ::proto::VideoMessage* HydratedFourRowTemplate::release_videomessage() {
   // @@protoc_insertion_point(field_release:proto.HydratedFourRowTemplate.videoMessage)
   if (_internal_has_videomessage()) {
     clear_has_title();
-      ::proto::VideoMessage* temp = title_.videomessage_;
+    ::proto::VideoMessage* temp = _impl_.title_.videomessage_;
     if (GetArenaForAllocation() != nullptr) {
       temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
     }
-    title_.videomessage_ = nullptr;
+    _impl_.title_.videomessage_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -38813,7 +40504,7 @@ inline ::proto::VideoMessage* HydratedFourRowTemplate::release_videomessage() {
 }
 inline const ::proto::VideoMessage& HydratedFourRowTemplate::_internal_videomessage() const {
   return _internal_has_videomessage()
-      ? *title_.videomessage_
+      ? *_impl_.title_.videomessage_
       : reinterpret_cast< ::proto::VideoMessage&>(::proto::_VideoMessage_default_instance_);
 }
 inline const ::proto::VideoMessage& HydratedFourRowTemplate::videomessage() const {
@@ -38824,8 +40515,8 @@ inline ::proto::VideoMessage* HydratedFourRowTemplate::unsafe_arena_release_vide
   // @@protoc_insertion_point(field_unsafe_arena_release:proto.HydratedFourRowTemplate.videoMessage)
   if (_internal_has_videomessage()) {
     clear_has_title();
-    ::proto::VideoMessage* temp = title_.videomessage_;
-    title_.videomessage_ = nullptr;
+    ::proto::VideoMessage* temp = _impl_.title_.videomessage_;
+    _impl_.title_.videomessage_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -38835,7 +40526,7 @@ inline void HydratedFourRowTemplate::unsafe_arena_set_allocated_videomessage(::p
   clear_title();
   if (videomessage) {
     set_has_videomessage();
-    title_.videomessage_ = videomessage;
+    _impl_.title_.videomessage_ = videomessage;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.HydratedFourRowTemplate.videoMessage)
 }
@@ -38843,9 +40534,9 @@ inline ::proto::VideoMessage* HydratedFourRowTemplate::_internal_mutable_videome
   if (!_internal_has_videomessage()) {
     clear_title();
     set_has_videomessage();
-    title_.videomessage_ = CreateMaybeMessage< ::proto::VideoMessage >(GetArenaForAllocation());
+    _impl_.title_.videomessage_ = CreateMaybeMessage< ::proto::VideoMessage >(GetArenaForAllocation());
   }
-  return title_.videomessage_;
+  return _impl_.title_.videomessage_;
 }
 inline ::proto::VideoMessage* HydratedFourRowTemplate::mutable_videomessage() {
   ::proto::VideoMessage* _msg = _internal_mutable_videomessage();
@@ -38861,12 +40552,12 @@ inline bool HydratedFourRowTemplate::has_locationmessage() const {
   return _internal_has_locationmessage();
 }
 inline void HydratedFourRowTemplate::set_has_locationmessage() {
-  _oneof_case_[0] = kLocationMessage;
+  _impl_._oneof_case_[0] = kLocationMessage;
 }
 inline void HydratedFourRowTemplate::clear_locationmessage() {
   if (_internal_has_locationmessage()) {
     if (GetArenaForAllocation() == nullptr) {
-      delete title_.locationmessage_;
+      delete _impl_.title_.locationmessage_;
     }
     clear_has_title();
   }
@@ -38875,11 +40566,11 @@ inline ::proto::LocationMessage* HydratedFourRowTemplate::release_locationmessag
   // @@protoc_insertion_point(field_release:proto.HydratedFourRowTemplate.locationMessage)
   if (_internal_has_locationmessage()) {
     clear_has_title();
-      ::proto::LocationMessage* temp = title_.locationmessage_;
+    ::proto::LocationMessage* temp = _impl_.title_.locationmessage_;
     if (GetArenaForAllocation() != nullptr) {
       temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
     }
-    title_.locationmessage_ = nullptr;
+    _impl_.title_.locationmessage_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -38887,7 +40578,7 @@ inline ::proto::LocationMessage* HydratedFourRowTemplate::release_locationmessag
 }
 inline const ::proto::LocationMessage& HydratedFourRowTemplate::_internal_locationmessage() const {
   return _internal_has_locationmessage()
-      ? *title_.locationmessage_
+      ? *_impl_.title_.locationmessage_
       : reinterpret_cast< ::proto::LocationMessage&>(::proto::_LocationMessage_default_instance_);
 }
 inline const ::proto::LocationMessage& HydratedFourRowTemplate::locationmessage() const {
@@ -38898,8 +40589,8 @@ inline ::proto::LocationMessage* HydratedFourRowTemplate::unsafe_arena_release_l
   // @@protoc_insertion_point(field_unsafe_arena_release:proto.HydratedFourRowTemplate.locationMessage)
   if (_internal_has_locationmessage()) {
     clear_has_title();
-    ::proto::LocationMessage* temp = title_.locationmessage_;
-    title_.locationmessage_ = nullptr;
+    ::proto::LocationMessage* temp = _impl_.title_.locationmessage_;
+    _impl_.title_.locationmessage_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -38909,7 +40600,7 @@ inline void HydratedFourRowTemplate::unsafe_arena_set_allocated_locationmessage(
   clear_title();
   if (locationmessage) {
     set_has_locationmessage();
-    title_.locationmessage_ = locationmessage;
+    _impl_.title_.locationmessage_ = locationmessage;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.HydratedFourRowTemplate.locationMessage)
 }
@@ -38917,9 +40608,9 @@ inline ::proto::LocationMessage* HydratedFourRowTemplate::_internal_mutable_loca
   if (!_internal_has_locationmessage()) {
     clear_title();
     set_has_locationmessage();
-    title_.locationmessage_ = CreateMaybeMessage< ::proto::LocationMessage >(GetArenaForAllocation());
+    _impl_.title_.locationmessage_ = CreateMaybeMessage< ::proto::LocationMessage >(GetArenaForAllocation());
   }
-  return title_.locationmessage_;
+  return _impl_.title_.locationmessage_;
 }
 inline ::proto::LocationMessage* HydratedFourRowTemplate::mutable_locationmessage() {
   ::proto::LocationMessage* _msg = _internal_mutable_locationmessage();
@@ -38931,10 +40622,10 @@ inline bool HydratedFourRowTemplate::has_title() const {
   return title_case() != TITLE_NOT_SET;
 }
 inline void HydratedFourRowTemplate::clear_has_title() {
-  _oneof_case_[0] = TITLE_NOT_SET;
+  _impl_._oneof_case_[0] = TITLE_NOT_SET;
 }
 inline HydratedFourRowTemplate::TitleCase HydratedFourRowTemplate::title_case() const {
-  return HydratedFourRowTemplate::TitleCase(_oneof_case_[0]);
+  return HydratedFourRowTemplate::TitleCase(_impl_._oneof_case_[0]);
 }
 // -------------------------------------------------------------------
 
@@ -38942,19 +40633,19 @@ inline HydratedFourRowTemplate::TitleCase HydratedFourRowTemplate::title_case()
 
 // optional .proto.ContextInfo contextInfo = 3;
 inline bool TemplateMessage::_internal_has_contextinfo() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || contextinfo_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.contextinfo_ != nullptr);
   return value;
 }
 inline bool TemplateMessage::has_contextinfo() const {
   return _internal_has_contextinfo();
 }
 inline void TemplateMessage::clear_contextinfo() {
-  if (contextinfo_ != nullptr) contextinfo_->Clear();
-  _has_bits_[0] &= ~0x00000001u;
+  if (_impl_.contextinfo_ != nullptr) _impl_.contextinfo_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const ::proto::ContextInfo& TemplateMessage::_internal_contextinfo() const {
-  const ::proto::ContextInfo* p = contextinfo_;
+  const ::proto::ContextInfo* p = _impl_.contextinfo_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ContextInfo&>(
       ::proto::_ContextInfo_default_instance_);
 }
@@ -38965,20 +40656,20 @@ inline const ::proto::ContextInfo& TemplateMessage::contextinfo() const {
 inline void TemplateMessage::unsafe_arena_set_allocated_contextinfo(
     ::proto::ContextInfo* contextinfo) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(contextinfo_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.contextinfo_);
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   if (contextinfo) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.TemplateMessage.contextInfo)
 }
 inline ::proto::ContextInfo* TemplateMessage::release_contextinfo() {
-  _has_bits_[0] &= ~0x00000001u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -38992,18 +40683,18 @@ inline ::proto::ContextInfo* TemplateMessage::release_contextinfo() {
 }
 inline ::proto::ContextInfo* TemplateMessage::unsafe_arena_release_contextinfo() {
   // @@protoc_insertion_point(field_release:proto.TemplateMessage.contextInfo)
-  _has_bits_[0] &= ~0x00000001u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
   return temp;
 }
 inline ::proto::ContextInfo* TemplateMessage::_internal_mutable_contextinfo() {
-  _has_bits_[0] |= 0x00000001u;
-  if (contextinfo_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000001u;
+  if (_impl_.contextinfo_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ContextInfo>(GetArenaForAllocation());
-    contextinfo_ = p;
+    _impl_.contextinfo_ = p;
   }
-  return contextinfo_;
+  return _impl_.contextinfo_;
 }
 inline ::proto::ContextInfo* TemplateMessage::mutable_contextinfo() {
   ::proto::ContextInfo* _msg = _internal_mutable_contextinfo();
@@ -39013,38 +40704,38 @@ inline ::proto::ContextInfo* TemplateMessage::mutable_contextinfo() {
 inline void TemplateMessage::set_allocated_contextinfo(::proto::ContextInfo* contextinfo) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete contextinfo_;
+    delete _impl_.contextinfo_;
   }
   if (contextinfo) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ContextInfo>::GetOwningArena(contextinfo);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(contextinfo);
     if (message_arena != submessage_arena) {
       contextinfo = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, contextinfo, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   // @@protoc_insertion_point(field_set_allocated:proto.TemplateMessage.contextInfo)
 }
 
 // optional .proto.HydratedFourRowTemplate hydratedTemplate = 4;
 inline bool TemplateMessage::_internal_has_hydratedtemplate() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || hydratedtemplate_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.hydratedtemplate_ != nullptr);
   return value;
 }
 inline bool TemplateMessage::has_hydratedtemplate() const {
   return _internal_has_hydratedtemplate();
 }
 inline void TemplateMessage::clear_hydratedtemplate() {
-  if (hydratedtemplate_ != nullptr) hydratedtemplate_->Clear();
-  _has_bits_[0] &= ~0x00000002u;
+  if (_impl_.hydratedtemplate_ != nullptr) _impl_.hydratedtemplate_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const ::proto::HydratedFourRowTemplate& TemplateMessage::_internal_hydratedtemplate() const {
-  const ::proto::HydratedFourRowTemplate* p = hydratedtemplate_;
+  const ::proto::HydratedFourRowTemplate* p = _impl_.hydratedtemplate_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::HydratedFourRowTemplate&>(
       ::proto::_HydratedFourRowTemplate_default_instance_);
 }
@@ -39055,20 +40746,20 @@ inline const ::proto::HydratedFourRowTemplate& TemplateMessage::hydratedtemplate
 inline void TemplateMessage::unsafe_arena_set_allocated_hydratedtemplate(
     ::proto::HydratedFourRowTemplate* hydratedtemplate) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(hydratedtemplate_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.hydratedtemplate_);
   }
-  hydratedtemplate_ = hydratedtemplate;
+  _impl_.hydratedtemplate_ = hydratedtemplate;
   if (hydratedtemplate) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.TemplateMessage.hydratedTemplate)
 }
 inline ::proto::HydratedFourRowTemplate* TemplateMessage::release_hydratedtemplate() {
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::HydratedFourRowTemplate* temp = hydratedtemplate_;
-  hydratedtemplate_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::HydratedFourRowTemplate* temp = _impl_.hydratedtemplate_;
+  _impl_.hydratedtemplate_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -39082,18 +40773,18 @@ inline ::proto::HydratedFourRowTemplate* TemplateMessage::release_hydratedtempla
 }
 inline ::proto::HydratedFourRowTemplate* TemplateMessage::unsafe_arena_release_hydratedtemplate() {
   // @@protoc_insertion_point(field_release:proto.TemplateMessage.hydratedTemplate)
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::HydratedFourRowTemplate* temp = hydratedtemplate_;
-  hydratedtemplate_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::HydratedFourRowTemplate* temp = _impl_.hydratedtemplate_;
+  _impl_.hydratedtemplate_ = nullptr;
   return temp;
 }
 inline ::proto::HydratedFourRowTemplate* TemplateMessage::_internal_mutable_hydratedtemplate() {
-  _has_bits_[0] |= 0x00000002u;
-  if (hydratedtemplate_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000002u;
+  if (_impl_.hydratedtemplate_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::HydratedFourRowTemplate>(GetArenaForAllocation());
-    hydratedtemplate_ = p;
+    _impl_.hydratedtemplate_ = p;
   }
-  return hydratedtemplate_;
+  return _impl_.hydratedtemplate_;
 }
 inline ::proto::HydratedFourRowTemplate* TemplateMessage::mutable_hydratedtemplate() {
   ::proto::HydratedFourRowTemplate* _msg = _internal_mutable_hydratedtemplate();
@@ -39103,20 +40794,20 @@ inline ::proto::HydratedFourRowTemplate* TemplateMessage::mutable_hydratedtempla
 inline void TemplateMessage::set_allocated_hydratedtemplate(::proto::HydratedFourRowTemplate* hydratedtemplate) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete hydratedtemplate_;
+    delete _impl_.hydratedtemplate_;
   }
   if (hydratedtemplate) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::HydratedFourRowTemplate>::GetOwningArena(hydratedtemplate);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(hydratedtemplate);
     if (message_arena != submessage_arena) {
       hydratedtemplate = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, hydratedtemplate, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  hydratedtemplate_ = hydratedtemplate;
+  _impl_.hydratedtemplate_ = hydratedtemplate;
   // @@protoc_insertion_point(field_set_allocated:proto.TemplateMessage.hydratedTemplate)
 }
 
@@ -39128,12 +40819,12 @@ inline bool TemplateMessage::has_fourrowtemplate() const {
   return _internal_has_fourrowtemplate();
 }
 inline void TemplateMessage::set_has_fourrowtemplate() {
-  _oneof_case_[0] = kFourRowTemplate;
+  _impl_._oneof_case_[0] = kFourRowTemplate;
 }
 inline void TemplateMessage::clear_fourrowtemplate() {
   if (_internal_has_fourrowtemplate()) {
     if (GetArenaForAllocation() == nullptr) {
-      delete format_.fourrowtemplate_;
+      delete _impl_.format_.fourrowtemplate_;
     }
     clear_has_format();
   }
@@ -39142,11 +40833,11 @@ inline ::proto::FourRowTemplate* TemplateMessage::release_fourrowtemplate() {
   // @@protoc_insertion_point(field_release:proto.TemplateMessage.fourRowTemplate)
   if (_internal_has_fourrowtemplate()) {
     clear_has_format();
-      ::proto::FourRowTemplate* temp = format_.fourrowtemplate_;
+    ::proto::FourRowTemplate* temp = _impl_.format_.fourrowtemplate_;
     if (GetArenaForAllocation() != nullptr) {
       temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
     }
-    format_.fourrowtemplate_ = nullptr;
+    _impl_.format_.fourrowtemplate_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -39154,7 +40845,7 @@ inline ::proto::FourRowTemplate* TemplateMessage::release_fourrowtemplate() {
 }
 inline const ::proto::FourRowTemplate& TemplateMessage::_internal_fourrowtemplate() const {
   return _internal_has_fourrowtemplate()
-      ? *format_.fourrowtemplate_
+      ? *_impl_.format_.fourrowtemplate_
       : reinterpret_cast< ::proto::FourRowTemplate&>(::proto::_FourRowTemplate_default_instance_);
 }
 inline const ::proto::FourRowTemplate& TemplateMessage::fourrowtemplate() const {
@@ -39165,8 +40856,8 @@ inline ::proto::FourRowTemplate* TemplateMessage::unsafe_arena_release_fourrowte
   // @@protoc_insertion_point(field_unsafe_arena_release:proto.TemplateMessage.fourRowTemplate)
   if (_internal_has_fourrowtemplate()) {
     clear_has_format();
-    ::proto::FourRowTemplate* temp = format_.fourrowtemplate_;
-    format_.fourrowtemplate_ = nullptr;
+    ::proto::FourRowTemplate* temp = _impl_.format_.fourrowtemplate_;
+    _impl_.format_.fourrowtemplate_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -39176,7 +40867,7 @@ inline void TemplateMessage::unsafe_arena_set_allocated_fourrowtemplate(::proto:
   clear_format();
   if (fourrowtemplate) {
     set_has_fourrowtemplate();
-    format_.fourrowtemplate_ = fourrowtemplate;
+    _impl_.format_.fourrowtemplate_ = fourrowtemplate;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.TemplateMessage.fourRowTemplate)
 }
@@ -39184,9 +40875,9 @@ inline ::proto::FourRowTemplate* TemplateMessage::_internal_mutable_fourrowtempl
   if (!_internal_has_fourrowtemplate()) {
     clear_format();
     set_has_fourrowtemplate();
-    format_.fourrowtemplate_ = CreateMaybeMessage< ::proto::FourRowTemplate >(GetArenaForAllocation());
+    _impl_.format_.fourrowtemplate_ = CreateMaybeMessage< ::proto::FourRowTemplate >(GetArenaForAllocation());
   }
-  return format_.fourrowtemplate_;
+  return _impl_.format_.fourrowtemplate_;
 }
 inline ::proto::FourRowTemplate* TemplateMessage::mutable_fourrowtemplate() {
   ::proto::FourRowTemplate* _msg = _internal_mutable_fourrowtemplate();
@@ -39202,12 +40893,12 @@ inline bool TemplateMessage::has_hydratedfourrowtemplate() const {
   return _internal_has_hydratedfourrowtemplate();
 }
 inline void TemplateMessage::set_has_hydratedfourrowtemplate() {
-  _oneof_case_[0] = kHydratedFourRowTemplate;
+  _impl_._oneof_case_[0] = kHydratedFourRowTemplate;
 }
 inline void TemplateMessage::clear_hydratedfourrowtemplate() {
   if (_internal_has_hydratedfourrowtemplate()) {
     if (GetArenaForAllocation() == nullptr) {
-      delete format_.hydratedfourrowtemplate_;
+      delete _impl_.format_.hydratedfourrowtemplate_;
     }
     clear_has_format();
   }
@@ -39216,11 +40907,11 @@ inline ::proto::HydratedFourRowTemplate* TemplateMessage::release_hydratedfourro
   // @@protoc_insertion_point(field_release:proto.TemplateMessage.hydratedFourRowTemplate)
   if (_internal_has_hydratedfourrowtemplate()) {
     clear_has_format();
-      ::proto::HydratedFourRowTemplate* temp = format_.hydratedfourrowtemplate_;
+    ::proto::HydratedFourRowTemplate* temp = _impl_.format_.hydratedfourrowtemplate_;
     if (GetArenaForAllocation() != nullptr) {
       temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
     }
-    format_.hydratedfourrowtemplate_ = nullptr;
+    _impl_.format_.hydratedfourrowtemplate_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -39228,7 +40919,7 @@ inline ::proto::HydratedFourRowTemplate* TemplateMessage::release_hydratedfourro
 }
 inline const ::proto::HydratedFourRowTemplate& TemplateMessage::_internal_hydratedfourrowtemplate() const {
   return _internal_has_hydratedfourrowtemplate()
-      ? *format_.hydratedfourrowtemplate_
+      ? *_impl_.format_.hydratedfourrowtemplate_
       : reinterpret_cast< ::proto::HydratedFourRowTemplate&>(::proto::_HydratedFourRowTemplate_default_instance_);
 }
 inline const ::proto::HydratedFourRowTemplate& TemplateMessage::hydratedfourrowtemplate() const {
@@ -39239,8 +40930,8 @@ inline ::proto::HydratedFourRowTemplate* TemplateMessage::unsafe_arena_release_h
   // @@protoc_insertion_point(field_unsafe_arena_release:proto.TemplateMessage.hydratedFourRowTemplate)
   if (_internal_has_hydratedfourrowtemplate()) {
     clear_has_format();
-    ::proto::HydratedFourRowTemplate* temp = format_.hydratedfourrowtemplate_;
-    format_.hydratedfourrowtemplate_ = nullptr;
+    ::proto::HydratedFourRowTemplate* temp = _impl_.format_.hydratedfourrowtemplate_;
+    _impl_.format_.hydratedfourrowtemplate_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -39250,7 +40941,7 @@ inline void TemplateMessage::unsafe_arena_set_allocated_hydratedfourrowtemplate(
   clear_format();
   if (hydratedfourrowtemplate) {
     set_has_hydratedfourrowtemplate();
-    format_.hydratedfourrowtemplate_ = hydratedfourrowtemplate;
+    _impl_.format_.hydratedfourrowtemplate_ = hydratedfourrowtemplate;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.TemplateMessage.hydratedFourRowTemplate)
 }
@@ -39258,9 +40949,9 @@ inline ::proto::HydratedFourRowTemplate* TemplateMessage::_internal_mutable_hydr
   if (!_internal_has_hydratedfourrowtemplate()) {
     clear_format();
     set_has_hydratedfourrowtemplate();
-    format_.hydratedfourrowtemplate_ = CreateMaybeMessage< ::proto::HydratedFourRowTemplate >(GetArenaForAllocation());
+    _impl_.format_.hydratedfourrowtemplate_ = CreateMaybeMessage< ::proto::HydratedFourRowTemplate >(GetArenaForAllocation());
   }
-  return format_.hydratedfourrowtemplate_;
+  return _impl_.format_.hydratedfourrowtemplate_;
 }
 inline ::proto::HydratedFourRowTemplate* TemplateMessage::mutable_hydratedfourrowtemplate() {
   ::proto::HydratedFourRowTemplate* _msg = _internal_mutable_hydratedfourrowtemplate();
@@ -39272,10 +40963,10 @@ inline bool TemplateMessage::has_format() const {
   return format_case() != FORMAT_NOT_SET;
 }
 inline void TemplateMessage::clear_has_format() {
-  _oneof_case_[0] = FORMAT_NOT_SET;
+  _impl_._oneof_case_[0] = FORMAT_NOT_SET;
 }
 inline TemplateMessage::FormatCase TemplateMessage::format_case() const {
-  return TemplateMessage::FormatCase(_oneof_case_[0]);
+  return TemplateMessage::FormatCase(_impl_._oneof_case_[0]);
 }
 // -------------------------------------------------------------------
 
@@ -39283,15 +40974,15 @@ inline TemplateMessage::FormatCase TemplateMessage::format_case() const {
 
 // optional string selectedId = 1;
 inline bool TemplateButtonReplyMessage::_internal_has_selectedid() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool TemplateButtonReplyMessage::has_selectedid() const {
   return _internal_has_selectedid();
 }
 inline void TemplateButtonReplyMessage::clear_selectedid() {
-  selectedid_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.selectedid_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& TemplateButtonReplyMessage::selectedid() const {
   // @@protoc_insertion_point(field_get:proto.TemplateButtonReplyMessage.selectedId)
@@ -39300,8 +40991,8 @@ inline const std::string& TemplateButtonReplyMessage::selectedid() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void TemplateButtonReplyMessage::set_selectedid(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- selectedid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.selectedid_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.TemplateButtonReplyMessage.selectedId)
 }
 inline std::string* TemplateButtonReplyMessage::mutable_selectedid() {
@@ -39310,46 +41001,56 @@ inline std::string* TemplateButtonReplyMessage::mutable_selectedid() {
   return _s;
 }
 inline const std::string& TemplateButtonReplyMessage::_internal_selectedid() const {
-  return selectedid_.Get();
+  return _impl_.selectedid_.Get();
 }
 inline void TemplateButtonReplyMessage::_internal_set_selectedid(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  selectedid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.selectedid_.Set(value, GetArenaForAllocation());
 }
 inline std::string* TemplateButtonReplyMessage::_internal_mutable_selectedid() {
-  _has_bits_[0] |= 0x00000001u;
-  return selectedid_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.selectedid_.Mutable(GetArenaForAllocation());
 }
 inline std::string* TemplateButtonReplyMessage::release_selectedid() {
   // @@protoc_insertion_point(field_release:proto.TemplateButtonReplyMessage.selectedId)
   if (!_internal_has_selectedid()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return selectedid_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.selectedid_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.selectedid_.IsDefault()) {
+    _impl_.selectedid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void TemplateButtonReplyMessage::set_allocated_selectedid(std::string* selectedid) {
   if (selectedid != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
+  }
+  _impl_.selectedid_.SetAllocated(selectedid, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.selectedid_.IsDefault()) {
+    _impl_.selectedid_.Set("", GetArenaForAllocation());
   }
-  selectedid_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), selectedid,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.TemplateButtonReplyMessage.selectedId)
 }
 
 // optional string selectedDisplayText = 2;
 inline bool TemplateButtonReplyMessage::_internal_has_selecteddisplaytext() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool TemplateButtonReplyMessage::has_selecteddisplaytext() const {
   return _internal_has_selecteddisplaytext();
 }
 inline void TemplateButtonReplyMessage::clear_selecteddisplaytext() {
-  selecteddisplaytext_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.selecteddisplaytext_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& TemplateButtonReplyMessage::selecteddisplaytext() const {
   // @@protoc_insertion_point(field_get:proto.TemplateButtonReplyMessage.selectedDisplayText)
@@ -39358,8 +41059,8 @@ inline const std::string& TemplateButtonReplyMessage::selecteddisplaytext() cons
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void TemplateButtonReplyMessage::set_selecteddisplaytext(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- selecteddisplaytext_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.selecteddisplaytext_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.TemplateButtonReplyMessage.selectedDisplayText)
 }
 inline std::string* TemplateButtonReplyMessage::mutable_selecteddisplaytext() {
@@ -39368,50 +41069,60 @@ inline std::string* TemplateButtonReplyMessage::mutable_selecteddisplaytext() {
   return _s;
 }
 inline const std::string& TemplateButtonReplyMessage::_internal_selecteddisplaytext() const {
-  return selecteddisplaytext_.Get();
+  return _impl_.selecteddisplaytext_.Get();
 }
 inline void TemplateButtonReplyMessage::_internal_set_selecteddisplaytext(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  selecteddisplaytext_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.selecteddisplaytext_.Set(value, GetArenaForAllocation());
 }
 inline std::string* TemplateButtonReplyMessage::_internal_mutable_selecteddisplaytext() {
-  _has_bits_[0] |= 0x00000002u;
-  return selecteddisplaytext_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.selecteddisplaytext_.Mutable(GetArenaForAllocation());
 }
 inline std::string* TemplateButtonReplyMessage::release_selecteddisplaytext() {
   // @@protoc_insertion_point(field_release:proto.TemplateButtonReplyMessage.selectedDisplayText)
   if (!_internal_has_selecteddisplaytext()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return selecteddisplaytext_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.selecteddisplaytext_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.selecteddisplaytext_.IsDefault()) {
+    _impl_.selecteddisplaytext_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void TemplateButtonReplyMessage::set_allocated_selecteddisplaytext(std::string* selecteddisplaytext) {
   if (selecteddisplaytext != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
+  }
+  _impl_.selecteddisplaytext_.SetAllocated(selecteddisplaytext, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.selecteddisplaytext_.IsDefault()) {
+    _impl_.selecteddisplaytext_.Set("", GetArenaForAllocation());
   }
-  selecteddisplaytext_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), selecteddisplaytext,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.TemplateButtonReplyMessage.selectedDisplayText)
 }
 
 // optional .proto.ContextInfo contextInfo = 3;
 inline bool TemplateButtonReplyMessage::_internal_has_contextinfo() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || contextinfo_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.contextinfo_ != nullptr);
   return value;
 }
 inline bool TemplateButtonReplyMessage::has_contextinfo() const {
   return _internal_has_contextinfo();
 }
 inline void TemplateButtonReplyMessage::clear_contextinfo() {
-  if (contextinfo_ != nullptr) contextinfo_->Clear();
-  _has_bits_[0] &= ~0x00000004u;
+  if (_impl_.contextinfo_ != nullptr) _impl_.contextinfo_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const ::proto::ContextInfo& TemplateButtonReplyMessage::_internal_contextinfo() const {
-  const ::proto::ContextInfo* p = contextinfo_;
+  const ::proto::ContextInfo* p = _impl_.contextinfo_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ContextInfo&>(
       ::proto::_ContextInfo_default_instance_);
 }
@@ -39422,20 +41133,20 @@ inline const ::proto::ContextInfo& TemplateButtonReplyMessage::contextinfo() con
 inline void TemplateButtonReplyMessage::unsafe_arena_set_allocated_contextinfo(
     ::proto::ContextInfo* contextinfo) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(contextinfo_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.contextinfo_);
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   if (contextinfo) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.TemplateButtonReplyMessage.contextInfo)
 }
 inline ::proto::ContextInfo* TemplateButtonReplyMessage::release_contextinfo() {
-  _has_bits_[0] &= ~0x00000004u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -39449,18 +41160,18 @@ inline ::proto::ContextInfo* TemplateButtonReplyMessage::release_contextinfo() {
 }
 inline ::proto::ContextInfo* TemplateButtonReplyMessage::unsafe_arena_release_contextinfo() {
   // @@protoc_insertion_point(field_release:proto.TemplateButtonReplyMessage.contextInfo)
-  _has_bits_[0] &= ~0x00000004u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
   return temp;
 }
 inline ::proto::ContextInfo* TemplateButtonReplyMessage::_internal_mutable_contextinfo() {
-  _has_bits_[0] |= 0x00000004u;
-  if (contextinfo_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000004u;
+  if (_impl_.contextinfo_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ContextInfo>(GetArenaForAllocation());
-    contextinfo_ = p;
+    _impl_.contextinfo_ = p;
   }
-  return contextinfo_;
+  return _impl_.contextinfo_;
 }
 inline ::proto::ContextInfo* TemplateButtonReplyMessage::mutable_contextinfo() {
   ::proto::ContextInfo* _msg = _internal_mutable_contextinfo();
@@ -39470,47 +41181,47 @@ inline ::proto::ContextInfo* TemplateButtonReplyMessage::mutable_contextinfo() {
 inline void TemplateButtonReplyMessage::set_allocated_contextinfo(::proto::ContextInfo* contextinfo) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete contextinfo_;
+    delete _impl_.contextinfo_;
   }
   if (contextinfo) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ContextInfo>::GetOwningArena(contextinfo);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(contextinfo);
     if (message_arena != submessage_arena) {
       contextinfo = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, contextinfo, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   // @@protoc_insertion_point(field_set_allocated:proto.TemplateButtonReplyMessage.contextInfo)
 }
 
 // optional uint32 selectedIndex = 4;
 inline bool TemplateButtonReplyMessage::_internal_has_selectedindex() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool TemplateButtonReplyMessage::has_selectedindex() const {
   return _internal_has_selectedindex();
 }
 inline void TemplateButtonReplyMessage::clear_selectedindex() {
-  selectedindex_ = 0u;
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.selectedindex_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 TemplateButtonReplyMessage::_internal_selectedindex() const {
-  return selectedindex_;
+inline uint32_t TemplateButtonReplyMessage::_internal_selectedindex() const {
+  return _impl_.selectedindex_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 TemplateButtonReplyMessage::selectedindex() const {
+inline uint32_t TemplateButtonReplyMessage::selectedindex() const {
   // @@protoc_insertion_point(field_get:proto.TemplateButtonReplyMessage.selectedIndex)
   return _internal_selectedindex();
 }
-inline void TemplateButtonReplyMessage::_internal_set_selectedindex(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000008u;
-  selectedindex_ = value;
+inline void TemplateButtonReplyMessage::_internal_set_selectedindex(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.selectedindex_ = value;
 }
-inline void TemplateButtonReplyMessage::set_selectedindex(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void TemplateButtonReplyMessage::set_selectedindex(uint32_t value) {
   _internal_set_selectedindex(value);
   // @@protoc_insertion_point(field_set:proto.TemplateButtonReplyMessage.selectedIndex)
 }
@@ -39521,19 +41232,19 @@ inline void TemplateButtonReplyMessage::set_selectedindex(::PROTOBUF_NAMESPACE_I
 
 // optional .proto.ImageMessage catalogImage = 1;
 inline bool CatalogSnapshot::_internal_has_catalogimage() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || catalogimage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.catalogimage_ != nullptr);
   return value;
 }
 inline bool CatalogSnapshot::has_catalogimage() const {
   return _internal_has_catalogimage();
 }
 inline void CatalogSnapshot::clear_catalogimage() {
-  if (catalogimage_ != nullptr) catalogimage_->Clear();
-  _has_bits_[0] &= ~0x00000004u;
+  if (_impl_.catalogimage_ != nullptr) _impl_.catalogimage_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const ::proto::ImageMessage& CatalogSnapshot::_internal_catalogimage() const {
-  const ::proto::ImageMessage* p = catalogimage_;
+  const ::proto::ImageMessage* p = _impl_.catalogimage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ImageMessage&>(
       ::proto::_ImageMessage_default_instance_);
 }
@@ -39544,20 +41255,20 @@ inline const ::proto::ImageMessage& CatalogSnapshot::catalogimage() const {
 inline void CatalogSnapshot::unsafe_arena_set_allocated_catalogimage(
     ::proto::ImageMessage* catalogimage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(catalogimage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.catalogimage_);
   }
-  catalogimage_ = catalogimage;
+  _impl_.catalogimage_ = catalogimage;
   if (catalogimage) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.CatalogSnapshot.catalogImage)
 }
 inline ::proto::ImageMessage* CatalogSnapshot::release_catalogimage() {
-  _has_bits_[0] &= ~0x00000004u;
-  ::proto::ImageMessage* temp = catalogimage_;
-  catalogimage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::proto::ImageMessage* temp = _impl_.catalogimage_;
+  _impl_.catalogimage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -39571,18 +41282,18 @@ inline ::proto::ImageMessage* CatalogSnapshot::release_catalogimage() {
 }
 inline ::proto::ImageMessage* CatalogSnapshot::unsafe_arena_release_catalogimage() {
   // @@protoc_insertion_point(field_release:proto.CatalogSnapshot.catalogImage)
-  _has_bits_[0] &= ~0x00000004u;
-  ::proto::ImageMessage* temp = catalogimage_;
-  catalogimage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::proto::ImageMessage* temp = _impl_.catalogimage_;
+  _impl_.catalogimage_ = nullptr;
   return temp;
 }
 inline ::proto::ImageMessage* CatalogSnapshot::_internal_mutable_catalogimage() {
-  _has_bits_[0] |= 0x00000004u;
-  if (catalogimage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000004u;
+  if (_impl_.catalogimage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ImageMessage>(GetArenaForAllocation());
-    catalogimage_ = p;
+    _impl_.catalogimage_ = p;
   }
-  return catalogimage_;
+  return _impl_.catalogimage_;
 }
 inline ::proto::ImageMessage* CatalogSnapshot::mutable_catalogimage() {
   ::proto::ImageMessage* _msg = _internal_mutable_catalogimage();
@@ -39592,34 +41303,34 @@ inline ::proto::ImageMessage* CatalogSnapshot::mutable_catalogimage() {
 inline void CatalogSnapshot::set_allocated_catalogimage(::proto::ImageMessage* catalogimage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete catalogimage_;
+    delete _impl_.catalogimage_;
   }
   if (catalogimage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ImageMessage>::GetOwningArena(catalogimage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(catalogimage);
     if (message_arena != submessage_arena) {
       catalogimage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, catalogimage, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
-  catalogimage_ = catalogimage;
+  _impl_.catalogimage_ = catalogimage;
   // @@protoc_insertion_point(field_set_allocated:proto.CatalogSnapshot.catalogImage)
 }
 
 // optional string title = 2;
 inline bool CatalogSnapshot::_internal_has_title() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool CatalogSnapshot::has_title() const {
   return _internal_has_title();
 }
 inline void CatalogSnapshot::clear_title() {
-  title_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.title_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& CatalogSnapshot::title() const {
   // @@protoc_insertion_point(field_get:proto.CatalogSnapshot.title)
@@ -39628,8 +41339,8 @@ inline const std::string& CatalogSnapshot::title() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void CatalogSnapshot::set_title(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- title_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.title_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.CatalogSnapshot.title)
 }
 inline std::string* CatalogSnapshot::mutable_title() {
@@ -39638,46 +41349,56 @@ inline std::string* CatalogSnapshot::mutable_title() {
   return _s;
 }
 inline const std::string& CatalogSnapshot::_internal_title() const {
-  return title_.Get();
+  return _impl_.title_.Get();
 }
 inline void CatalogSnapshot::_internal_set_title(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  title_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.title_.Set(value, GetArenaForAllocation());
 }
 inline std::string* CatalogSnapshot::_internal_mutable_title() {
-  _has_bits_[0] |= 0x00000001u;
-  return title_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.title_.Mutable(GetArenaForAllocation());
 }
 inline std::string* CatalogSnapshot::release_title() {
   // @@protoc_insertion_point(field_release:proto.CatalogSnapshot.title)
   if (!_internal_has_title()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return title_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.title_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.title_.IsDefault()) {
+    _impl_.title_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void CatalogSnapshot::set_allocated_title(std::string* title) {
   if (title != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  title_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), title,
-      GetArenaForAllocation());
+  _impl_.title_.SetAllocated(title, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.title_.IsDefault()) {
+    _impl_.title_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.CatalogSnapshot.title)
 }
 
 // optional string description = 3;
 inline bool CatalogSnapshot::_internal_has_description() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool CatalogSnapshot::has_description() const {
   return _internal_has_description();
 }
 inline void CatalogSnapshot::clear_description() {
-  description_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.description_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& CatalogSnapshot::description() const {
   // @@protoc_insertion_point(field_get:proto.CatalogSnapshot.description)
@@ -39686,8 +41407,8 @@ inline const std::string& CatalogSnapshot::description() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void CatalogSnapshot::set_description(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- description_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.description_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.CatalogSnapshot.description)
 }
 inline std::string* CatalogSnapshot::mutable_description() {
@@ -39696,32 +41417,42 @@ inline std::string* CatalogSnapshot::mutable_description() {
   return _s;
 }
 inline const std::string& CatalogSnapshot::_internal_description() const {
-  return description_.Get();
+  return _impl_.description_.Get();
 }
 inline void CatalogSnapshot::_internal_set_description(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  description_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.description_.Set(value, GetArenaForAllocation());
 }
 inline std::string* CatalogSnapshot::_internal_mutable_description() {
-  _has_bits_[0] |= 0x00000002u;
-  return description_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.description_.Mutable(GetArenaForAllocation());
 }
 inline std::string* CatalogSnapshot::release_description() {
   // @@protoc_insertion_point(field_release:proto.CatalogSnapshot.description)
   if (!_internal_has_description()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return description_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.description_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.description_.IsDefault()) {
+    _impl_.description_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void CatalogSnapshot::set_allocated_description(std::string* description) {
   if (description != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  description_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), description,
-      GetArenaForAllocation());
+  _impl_.description_.SetAllocated(description, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.description_.IsDefault()) {
+    _impl_.description_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.CatalogSnapshot.description)
 }
 
@@ -39731,19 +41462,19 @@ inline void CatalogSnapshot::set_allocated_description(std::string* description)
 
 // optional .proto.ImageMessage productImage = 1;
 inline bool ProductSnapshot::_internal_has_productimage() const {
-  bool value = (_has_bits_[0] & 0x00000080u) != 0;
-  PROTOBUF_ASSUME(!value || productimage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000080u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.productimage_ != nullptr);
   return value;
 }
 inline bool ProductSnapshot::has_productimage() const {
   return _internal_has_productimage();
 }
 inline void ProductSnapshot::clear_productimage() {
-  if (productimage_ != nullptr) productimage_->Clear();
-  _has_bits_[0] &= ~0x00000080u;
+  if (_impl_.productimage_ != nullptr) _impl_.productimage_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000080u;
 }
 inline const ::proto::ImageMessage& ProductSnapshot::_internal_productimage() const {
-  const ::proto::ImageMessage* p = productimage_;
+  const ::proto::ImageMessage* p = _impl_.productimage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ImageMessage&>(
       ::proto::_ImageMessage_default_instance_);
 }
@@ -39754,20 +41485,20 @@ inline const ::proto::ImageMessage& ProductSnapshot::productimage() const {
 inline void ProductSnapshot::unsafe_arena_set_allocated_productimage(
     ::proto::ImageMessage* productimage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(productimage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.productimage_);
   }
-  productimage_ = productimage;
+  _impl_.productimage_ = productimage;
   if (productimage) {
-    _has_bits_[0] |= 0x00000080u;
+    _impl_._has_bits_[0] |= 0x00000080u;
   } else {
-    _has_bits_[0] &= ~0x00000080u;
+    _impl_._has_bits_[0] &= ~0x00000080u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.ProductSnapshot.productImage)
 }
 inline ::proto::ImageMessage* ProductSnapshot::release_productimage() {
-  _has_bits_[0] &= ~0x00000080u;
-  ::proto::ImageMessage* temp = productimage_;
-  productimage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000080u;
+  ::proto::ImageMessage* temp = _impl_.productimage_;
+  _impl_.productimage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -39781,18 +41512,18 @@ inline ::proto::ImageMessage* ProductSnapshot::release_productimage() {
 }
 inline ::proto::ImageMessage* ProductSnapshot::unsafe_arena_release_productimage() {
   // @@protoc_insertion_point(field_release:proto.ProductSnapshot.productImage)
-  _has_bits_[0] &= ~0x00000080u;
-  ::proto::ImageMessage* temp = productimage_;
-  productimage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000080u;
+  ::proto::ImageMessage* temp = _impl_.productimage_;
+  _impl_.productimage_ = nullptr;
   return temp;
 }
 inline ::proto::ImageMessage* ProductSnapshot::_internal_mutable_productimage() {
-  _has_bits_[0] |= 0x00000080u;
-  if (productimage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000080u;
+  if (_impl_.productimage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ImageMessage>(GetArenaForAllocation());
-    productimage_ = p;
+    _impl_.productimage_ = p;
   }
-  return productimage_;
+  return _impl_.productimage_;
 }
 inline ::proto::ImageMessage* ProductSnapshot::mutable_productimage() {
   ::proto::ImageMessage* _msg = _internal_mutable_productimage();
@@ -39802,34 +41533,34 @@ inline ::proto::ImageMessage* ProductSnapshot::mutable_productimage() {
 inline void ProductSnapshot::set_allocated_productimage(::proto::ImageMessage* productimage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete productimage_;
+    delete _impl_.productimage_;
   }
   if (productimage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ImageMessage>::GetOwningArena(productimage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(productimage);
     if (message_arena != submessage_arena) {
       productimage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, productimage, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000080u;
+    _impl_._has_bits_[0] |= 0x00000080u;
   } else {
-    _has_bits_[0] &= ~0x00000080u;
+    _impl_._has_bits_[0] &= ~0x00000080u;
   }
-  productimage_ = productimage;
+  _impl_.productimage_ = productimage;
   // @@protoc_insertion_point(field_set_allocated:proto.ProductSnapshot.productImage)
 }
 
 // optional string productId = 2;
 inline bool ProductSnapshot::_internal_has_productid() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool ProductSnapshot::has_productid() const {
   return _internal_has_productid();
 }
 inline void ProductSnapshot::clear_productid() {
-  productid_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.productid_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& ProductSnapshot::productid() const {
   // @@protoc_insertion_point(field_get:proto.ProductSnapshot.productId)
@@ -39838,8 +41569,8 @@ inline const std::string& ProductSnapshot::productid() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ProductSnapshot::set_productid(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- productid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.productid_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ProductSnapshot.productId)
 }
 inline std::string* ProductSnapshot::mutable_productid() {
@@ -39848,46 +41579,56 @@ inline std::string* ProductSnapshot::mutable_productid() {
   return _s;
 }
 inline const std::string& ProductSnapshot::_internal_productid() const {
-  return productid_.Get();
+  return _impl_.productid_.Get();
 }
 inline void ProductSnapshot::_internal_set_productid(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  productid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.productid_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ProductSnapshot::_internal_mutable_productid() {
-  _has_bits_[0] |= 0x00000001u;
-  return productid_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.productid_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ProductSnapshot::release_productid() {
   // @@protoc_insertion_point(field_release:proto.ProductSnapshot.productId)
   if (!_internal_has_productid()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return productid_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.productid_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.productid_.IsDefault()) {
+    _impl_.productid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ProductSnapshot::set_allocated_productid(std::string* productid) {
   if (productid != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  productid_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), productid,
-      GetArenaForAllocation());
+  _impl_.productid_.SetAllocated(productid, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.productid_.IsDefault()) {
+    _impl_.productid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ProductSnapshot.productId)
 }
 
 // optional string title = 3;
 inline bool ProductSnapshot::_internal_has_title() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool ProductSnapshot::has_title() const {
   return _internal_has_title();
 }
 inline void ProductSnapshot::clear_title() {
-  title_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.title_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& ProductSnapshot::title() const {
   // @@protoc_insertion_point(field_get:proto.ProductSnapshot.title)
@@ -39896,8 +41637,8 @@ inline const std::string& ProductSnapshot::title() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ProductSnapshot::set_title(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- title_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.title_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ProductSnapshot.title)
 }
 inline std::string* ProductSnapshot::mutable_title() {
@@ -39906,46 +41647,56 @@ inline std::string* ProductSnapshot::mutable_title() {
   return _s;
 }
 inline const std::string& ProductSnapshot::_internal_title() const {
-  return title_.Get();
+  return _impl_.title_.Get();
 }
 inline void ProductSnapshot::_internal_set_title(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  title_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.title_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ProductSnapshot::_internal_mutable_title() {
-  _has_bits_[0] |= 0x00000002u;
-  return title_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.title_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ProductSnapshot::release_title() {
   // @@protoc_insertion_point(field_release:proto.ProductSnapshot.title)
   if (!_internal_has_title()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return title_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.title_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.title_.IsDefault()) {
+    _impl_.title_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ProductSnapshot::set_allocated_title(std::string* title) {
   if (title != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  title_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), title,
-      GetArenaForAllocation());
+  _impl_.title_.SetAllocated(title, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.title_.IsDefault()) {
+    _impl_.title_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ProductSnapshot.title)
 }
 
 // optional string description = 4;
 inline bool ProductSnapshot::_internal_has_description() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool ProductSnapshot::has_description() const {
   return _internal_has_description();
 }
 inline void ProductSnapshot::clear_description() {
-  description_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.description_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const std::string& ProductSnapshot::description() const {
   // @@protoc_insertion_point(field_get:proto.ProductSnapshot.description)
@@ -39954,8 +41705,8 @@ inline const std::string& ProductSnapshot::description() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ProductSnapshot::set_description(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000004u;
- description_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000004u;
+ _impl_.description_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ProductSnapshot.description)
 }
 inline std::string* ProductSnapshot::mutable_description() {
@@ -39964,46 +41715,56 @@ inline std::string* ProductSnapshot::mutable_description() {
   return _s;
 }
 inline const std::string& ProductSnapshot::_internal_description() const {
-  return description_.Get();
+  return _impl_.description_.Get();
 }
 inline void ProductSnapshot::_internal_set_description(const std::string& value) {
-  _has_bits_[0] |= 0x00000004u;
-  description_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.description_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ProductSnapshot::_internal_mutable_description() {
-  _has_bits_[0] |= 0x00000004u;
-  return description_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  return _impl_.description_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ProductSnapshot::release_description() {
   // @@protoc_insertion_point(field_release:proto.ProductSnapshot.description)
   if (!_internal_has_description()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000004u;
-  return description_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  auto* p = _impl_.description_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.description_.IsDefault()) {
+    _impl_.description_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ProductSnapshot::set_allocated_description(std::string* description) {
   if (description != nullptr) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
-  description_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), description,
-      GetArenaForAllocation());
+  _impl_.description_.SetAllocated(description, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.description_.IsDefault()) {
+    _impl_.description_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ProductSnapshot.description)
 }
 
 // optional string currencyCode = 5;
 inline bool ProductSnapshot::_internal_has_currencycode() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool ProductSnapshot::has_currencycode() const {
   return _internal_has_currencycode();
 }
 inline void ProductSnapshot::clear_currencycode() {
-  currencycode_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.currencycode_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline const std::string& ProductSnapshot::currencycode() const {
   // @@protoc_insertion_point(field_get:proto.ProductSnapshot.currencyCode)
@@ -40012,8 +41773,8 @@ inline const std::string& ProductSnapshot::currencycode() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ProductSnapshot::set_currencycode(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000008u;
- currencycode_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000008u;
+ _impl_.currencycode_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ProductSnapshot.currencyCode)
 }
 inline std::string* ProductSnapshot::mutable_currencycode() {
@@ -40022,74 +41783,84 @@ inline std::string* ProductSnapshot::mutable_currencycode() {
   return _s;
 }
 inline const std::string& ProductSnapshot::_internal_currencycode() const {
-  return currencycode_.Get();
+  return _impl_.currencycode_.Get();
 }
 inline void ProductSnapshot::_internal_set_currencycode(const std::string& value) {
-  _has_bits_[0] |= 0x00000008u;
-  currencycode_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.currencycode_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ProductSnapshot::_internal_mutable_currencycode() {
-  _has_bits_[0] |= 0x00000008u;
-  return currencycode_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  return _impl_.currencycode_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ProductSnapshot::release_currencycode() {
   // @@protoc_insertion_point(field_release:proto.ProductSnapshot.currencyCode)
   if (!_internal_has_currencycode()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000008u;
-  return currencycode_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  auto* p = _impl_.currencycode_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.currencycode_.IsDefault()) {
+    _impl_.currencycode_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ProductSnapshot::set_allocated_currencycode(std::string* currencycode) {
   if (currencycode != nullptr) {
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
   }
-  currencycode_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), currencycode,
-      GetArenaForAllocation());
+  _impl_.currencycode_.SetAllocated(currencycode, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.currencycode_.IsDefault()) {
+    _impl_.currencycode_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ProductSnapshot.currencyCode)
 }
 
 // optional int64 priceAmount1000 = 6;
 inline bool ProductSnapshot::_internal_has_priceamount1000() const {
-  bool value = (_has_bits_[0] & 0x00000100u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000100u) != 0;
   return value;
 }
 inline bool ProductSnapshot::has_priceamount1000() const {
   return _internal_has_priceamount1000();
 }
 inline void ProductSnapshot::clear_priceamount1000() {
-  priceamount1000_ = int64_t{0};
-  _has_bits_[0] &= ~0x00000100u;
+  _impl_.priceamount1000_ = int64_t{0};
+  _impl_._has_bits_[0] &= ~0x00000100u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 ProductSnapshot::_internal_priceamount1000() const {
-  return priceamount1000_;
+inline int64_t ProductSnapshot::_internal_priceamount1000() const {
+  return _impl_.priceamount1000_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 ProductSnapshot::priceamount1000() const {
+inline int64_t ProductSnapshot::priceamount1000() const {
   // @@protoc_insertion_point(field_get:proto.ProductSnapshot.priceAmount1000)
   return _internal_priceamount1000();
 }
-inline void ProductSnapshot::_internal_set_priceamount1000(::PROTOBUF_NAMESPACE_ID::int64 value) {
-  _has_bits_[0] |= 0x00000100u;
-  priceamount1000_ = value;
+inline void ProductSnapshot::_internal_set_priceamount1000(int64_t value) {
+  _impl_._has_bits_[0] |= 0x00000100u;
+  _impl_.priceamount1000_ = value;
 }
-inline void ProductSnapshot::set_priceamount1000(::PROTOBUF_NAMESPACE_ID::int64 value) {
+inline void ProductSnapshot::set_priceamount1000(int64_t value) {
   _internal_set_priceamount1000(value);
   // @@protoc_insertion_point(field_set:proto.ProductSnapshot.priceAmount1000)
 }
 
 // optional string retailerId = 7;
 inline bool ProductSnapshot::_internal_has_retailerid() const {
-  bool value = (_has_bits_[0] & 0x00000010u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
   return value;
 }
 inline bool ProductSnapshot::has_retailerid() const {
   return _internal_has_retailerid();
 }
 inline void ProductSnapshot::clear_retailerid() {
-  retailerid_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000010u;
+  _impl_.retailerid_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000010u;
 }
 inline const std::string& ProductSnapshot::retailerid() const {
   // @@protoc_insertion_point(field_get:proto.ProductSnapshot.retailerId)
@@ -40098,8 +41869,8 @@ inline const std::string& ProductSnapshot::retailerid() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ProductSnapshot::set_retailerid(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000010u;
- retailerid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000010u;
+ _impl_.retailerid_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ProductSnapshot.retailerId)
 }
 inline std::string* ProductSnapshot::mutable_retailerid() {
@@ -40108,46 +41879,56 @@ inline std::string* ProductSnapshot::mutable_retailerid() {
   return _s;
 }
 inline const std::string& ProductSnapshot::_internal_retailerid() const {
-  return retailerid_.Get();
+  return _impl_.retailerid_.Get();
 }
 inline void ProductSnapshot::_internal_set_retailerid(const std::string& value) {
-  _has_bits_[0] |= 0x00000010u;
-  retailerid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  _impl_.retailerid_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ProductSnapshot::_internal_mutable_retailerid() {
-  _has_bits_[0] |= 0x00000010u;
-  return retailerid_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  return _impl_.retailerid_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ProductSnapshot::release_retailerid() {
   // @@protoc_insertion_point(field_release:proto.ProductSnapshot.retailerId)
   if (!_internal_has_retailerid()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000010u;
-  return retailerid_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000010u;
+  auto* p = _impl_.retailerid_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.retailerid_.IsDefault()) {
+    _impl_.retailerid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ProductSnapshot::set_allocated_retailerid(std::string* retailerid) {
   if (retailerid != nullptr) {
-    _has_bits_[0] |= 0x00000010u;
+    _impl_._has_bits_[0] |= 0x00000010u;
   } else {
-    _has_bits_[0] &= ~0x00000010u;
+    _impl_._has_bits_[0] &= ~0x00000010u;
   }
-  retailerid_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), retailerid,
-      GetArenaForAllocation());
+  _impl_.retailerid_.SetAllocated(retailerid, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.retailerid_.IsDefault()) {
+    _impl_.retailerid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ProductSnapshot.retailerId)
 }
 
 // optional string url = 8;
 inline bool ProductSnapshot::_internal_has_url() const {
-  bool value = (_has_bits_[0] & 0x00000020u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
   return value;
 }
 inline bool ProductSnapshot::has_url() const {
   return _internal_has_url();
 }
 inline void ProductSnapshot::clear_url() {
-  url_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000020u;
+  _impl_.url_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000020u;
 }
 inline const std::string& ProductSnapshot::url() const {
   // @@protoc_insertion_point(field_get:proto.ProductSnapshot.url)
@@ -40156,8 +41937,8 @@ inline const std::string& ProductSnapshot::url() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ProductSnapshot::set_url(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000020u;
- url_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000020u;
+ _impl_.url_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ProductSnapshot.url)
 }
 inline std::string* ProductSnapshot::mutable_url() {
@@ -40166,74 +41947,84 @@ inline std::string* ProductSnapshot::mutable_url() {
   return _s;
 }
 inline const std::string& ProductSnapshot::_internal_url() const {
-  return url_.Get();
+  return _impl_.url_.Get();
 }
 inline void ProductSnapshot::_internal_set_url(const std::string& value) {
-  _has_bits_[0] |= 0x00000020u;
-  url_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000020u;
+  _impl_.url_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ProductSnapshot::_internal_mutable_url() {
-  _has_bits_[0] |= 0x00000020u;
-  return url_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000020u;
+  return _impl_.url_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ProductSnapshot::release_url() {
   // @@protoc_insertion_point(field_release:proto.ProductSnapshot.url)
   if (!_internal_has_url()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000020u;
-  return url_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000020u;
+  auto* p = _impl_.url_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.url_.IsDefault()) {
+    _impl_.url_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ProductSnapshot::set_allocated_url(std::string* url) {
   if (url != nullptr) {
-    _has_bits_[0] |= 0x00000020u;
+    _impl_._has_bits_[0] |= 0x00000020u;
   } else {
-    _has_bits_[0] &= ~0x00000020u;
+    _impl_._has_bits_[0] &= ~0x00000020u;
+  }
+  _impl_.url_.SetAllocated(url, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.url_.IsDefault()) {
+    _impl_.url_.Set("", GetArenaForAllocation());
   }
-  url_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), url,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ProductSnapshot.url)
 }
 
 // optional uint32 productImageCount = 9;
 inline bool ProductSnapshot::_internal_has_productimagecount() const {
-  bool value = (_has_bits_[0] & 0x00000200u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000200u) != 0;
   return value;
 }
 inline bool ProductSnapshot::has_productimagecount() const {
   return _internal_has_productimagecount();
 }
 inline void ProductSnapshot::clear_productimagecount() {
-  productimagecount_ = 0u;
-  _has_bits_[0] &= ~0x00000200u;
+  _impl_.productimagecount_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000200u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 ProductSnapshot::_internal_productimagecount() const {
-  return productimagecount_;
+inline uint32_t ProductSnapshot::_internal_productimagecount() const {
+  return _impl_.productimagecount_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 ProductSnapshot::productimagecount() const {
+inline uint32_t ProductSnapshot::productimagecount() const {
   // @@protoc_insertion_point(field_get:proto.ProductSnapshot.productImageCount)
   return _internal_productimagecount();
 }
-inline void ProductSnapshot::_internal_set_productimagecount(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000200u;
-  productimagecount_ = value;
+inline void ProductSnapshot::_internal_set_productimagecount(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000200u;
+  _impl_.productimagecount_ = value;
 }
-inline void ProductSnapshot::set_productimagecount(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void ProductSnapshot::set_productimagecount(uint32_t value) {
   _internal_set_productimagecount(value);
   // @@protoc_insertion_point(field_set:proto.ProductSnapshot.productImageCount)
 }
 
 // optional string firstImageId = 11;
 inline bool ProductSnapshot::_internal_has_firstimageid() const {
-  bool value = (_has_bits_[0] & 0x00000040u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
   return value;
 }
 inline bool ProductSnapshot::has_firstimageid() const {
   return _internal_has_firstimageid();
 }
 inline void ProductSnapshot::clear_firstimageid() {
-  firstimageid_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000040u;
+  _impl_.firstimageid_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000040u;
 }
 inline const std::string& ProductSnapshot::firstimageid() const {
   // @@protoc_insertion_point(field_get:proto.ProductSnapshot.firstImageId)
@@ -40242,8 +42033,8 @@ inline const std::string& ProductSnapshot::firstimageid() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ProductSnapshot::set_firstimageid(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000040u;
- firstimageid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000040u;
+ _impl_.firstimageid_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ProductSnapshot.firstImageId)
 }
 inline std::string* ProductSnapshot::mutable_firstimageid() {
@@ -40252,32 +42043,42 @@ inline std::string* ProductSnapshot::mutable_firstimageid() {
   return _s;
 }
 inline const std::string& ProductSnapshot::_internal_firstimageid() const {
-  return firstimageid_.Get();
+  return _impl_.firstimageid_.Get();
 }
 inline void ProductSnapshot::_internal_set_firstimageid(const std::string& value) {
-  _has_bits_[0] |= 0x00000040u;
-  firstimageid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000040u;
+  _impl_.firstimageid_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ProductSnapshot::_internal_mutable_firstimageid() {
-  _has_bits_[0] |= 0x00000040u;
-  return firstimageid_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000040u;
+  return _impl_.firstimageid_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ProductSnapshot::release_firstimageid() {
   // @@protoc_insertion_point(field_release:proto.ProductSnapshot.firstImageId)
   if (!_internal_has_firstimageid()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000040u;
-  return firstimageid_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000040u;
+  auto* p = _impl_.firstimageid_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.firstimageid_.IsDefault()) {
+    _impl_.firstimageid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ProductSnapshot::set_allocated_firstimageid(std::string* firstimageid) {
   if (firstimageid != nullptr) {
-    _has_bits_[0] |= 0x00000040u;
+    _impl_._has_bits_[0] |= 0x00000040u;
   } else {
-    _has_bits_[0] &= ~0x00000040u;
+    _impl_._has_bits_[0] &= ~0x00000040u;
+  }
+  _impl_.firstimageid_.SetAllocated(firstimageid, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.firstimageid_.IsDefault()) {
+    _impl_.firstimageid_.Set("", GetArenaForAllocation());
   }
-  firstimageid_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), firstimageid,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ProductSnapshot.firstImageId)
 }
 
@@ -40287,19 +42088,19 @@ inline void ProductSnapshot::set_allocated_firstimageid(std::string* firstimagei
 
 // optional .proto.ProductSnapshot product = 1;
 inline bool ProductMessage::_internal_has_product() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || product_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.product_ != nullptr);
   return value;
 }
 inline bool ProductMessage::has_product() const {
   return _internal_has_product();
 }
 inline void ProductMessage::clear_product() {
-  if (product_ != nullptr) product_->Clear();
-  _has_bits_[0] &= ~0x00000002u;
+  if (_impl_.product_ != nullptr) _impl_.product_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const ::proto::ProductSnapshot& ProductMessage::_internal_product() const {
-  const ::proto::ProductSnapshot* p = product_;
+  const ::proto::ProductSnapshot* p = _impl_.product_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ProductSnapshot&>(
       ::proto::_ProductSnapshot_default_instance_);
 }
@@ -40310,20 +42111,20 @@ inline const ::proto::ProductSnapshot& ProductMessage::product() const {
 inline void ProductMessage::unsafe_arena_set_allocated_product(
     ::proto::ProductSnapshot* product) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(product_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.product_);
   }
-  product_ = product;
+  _impl_.product_ = product;
   if (product) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.ProductMessage.product)
 }
 inline ::proto::ProductSnapshot* ProductMessage::release_product() {
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::ProductSnapshot* temp = product_;
-  product_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::ProductSnapshot* temp = _impl_.product_;
+  _impl_.product_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -40337,18 +42138,18 @@ inline ::proto::ProductSnapshot* ProductMessage::release_product() {
 }
 inline ::proto::ProductSnapshot* ProductMessage::unsafe_arena_release_product() {
   // @@protoc_insertion_point(field_release:proto.ProductMessage.product)
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::ProductSnapshot* temp = product_;
-  product_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::ProductSnapshot* temp = _impl_.product_;
+  _impl_.product_ = nullptr;
   return temp;
 }
 inline ::proto::ProductSnapshot* ProductMessage::_internal_mutable_product() {
-  _has_bits_[0] |= 0x00000002u;
-  if (product_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000002u;
+  if (_impl_.product_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ProductSnapshot>(GetArenaForAllocation());
-    product_ = p;
+    _impl_.product_ = p;
   }
-  return product_;
+  return _impl_.product_;
 }
 inline ::proto::ProductSnapshot* ProductMessage::mutable_product() {
   ::proto::ProductSnapshot* _msg = _internal_mutable_product();
@@ -40358,34 +42159,34 @@ inline ::proto::ProductSnapshot* ProductMessage::mutable_product() {
 inline void ProductMessage::set_allocated_product(::proto::ProductSnapshot* product) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete product_;
+    delete _impl_.product_;
   }
   if (product) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ProductSnapshot>::GetOwningArena(product);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(product);
     if (message_arena != submessage_arena) {
       product = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, product, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  product_ = product;
+  _impl_.product_ = product;
   // @@protoc_insertion_point(field_set_allocated:proto.ProductMessage.product)
 }
 
 // optional string businessOwnerJid = 2;
 inline bool ProductMessage::_internal_has_businessownerjid() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool ProductMessage::has_businessownerjid() const {
   return _internal_has_businessownerjid();
 }
 inline void ProductMessage::clear_businessownerjid() {
-  businessownerjid_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.businessownerjid_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& ProductMessage::businessownerjid() const {
   // @@protoc_insertion_point(field_get:proto.ProductMessage.businessOwnerJid)
@@ -40394,8 +42195,8 @@ inline const std::string& ProductMessage::businessownerjid() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ProductMessage::set_businessownerjid(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- businessownerjid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.businessownerjid_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ProductMessage.businessOwnerJid)
 }
 inline std::string* ProductMessage::mutable_businessownerjid() {
@@ -40404,50 +42205,60 @@ inline std::string* ProductMessage::mutable_businessownerjid() {
   return _s;
 }
 inline const std::string& ProductMessage::_internal_businessownerjid() const {
-  return businessownerjid_.Get();
+  return _impl_.businessownerjid_.Get();
 }
 inline void ProductMessage::_internal_set_businessownerjid(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  businessownerjid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.businessownerjid_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ProductMessage::_internal_mutable_businessownerjid() {
-  _has_bits_[0] |= 0x00000001u;
-  return businessownerjid_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.businessownerjid_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ProductMessage::release_businessownerjid() {
   // @@protoc_insertion_point(field_release:proto.ProductMessage.businessOwnerJid)
   if (!_internal_has_businessownerjid()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return businessownerjid_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.businessownerjid_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.businessownerjid_.IsDefault()) {
+    _impl_.businessownerjid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ProductMessage::set_allocated_businessownerjid(std::string* businessownerjid) {
   if (businessownerjid != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
+  }
+  _impl_.businessownerjid_.SetAllocated(businessownerjid, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.businessownerjid_.IsDefault()) {
+    _impl_.businessownerjid_.Set("", GetArenaForAllocation());
   }
-  businessownerjid_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), businessownerjid,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ProductMessage.businessOwnerJid)
 }
 
 // optional .proto.CatalogSnapshot catalog = 4;
 inline bool ProductMessage::_internal_has_catalog() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || catalog_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.catalog_ != nullptr);
   return value;
 }
 inline bool ProductMessage::has_catalog() const {
   return _internal_has_catalog();
 }
 inline void ProductMessage::clear_catalog() {
-  if (catalog_ != nullptr) catalog_->Clear();
-  _has_bits_[0] &= ~0x00000004u;
+  if (_impl_.catalog_ != nullptr) _impl_.catalog_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const ::proto::CatalogSnapshot& ProductMessage::_internal_catalog() const {
-  const ::proto::CatalogSnapshot* p = catalog_;
+  const ::proto::CatalogSnapshot* p = _impl_.catalog_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::CatalogSnapshot&>(
       ::proto::_CatalogSnapshot_default_instance_);
 }
@@ -40458,20 +42269,20 @@ inline const ::proto::CatalogSnapshot& ProductMessage::catalog() const {
 inline void ProductMessage::unsafe_arena_set_allocated_catalog(
     ::proto::CatalogSnapshot* catalog) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(catalog_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.catalog_);
   }
-  catalog_ = catalog;
+  _impl_.catalog_ = catalog;
   if (catalog) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.ProductMessage.catalog)
 }
 inline ::proto::CatalogSnapshot* ProductMessage::release_catalog() {
-  _has_bits_[0] &= ~0x00000004u;
-  ::proto::CatalogSnapshot* temp = catalog_;
-  catalog_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::proto::CatalogSnapshot* temp = _impl_.catalog_;
+  _impl_.catalog_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -40485,18 +42296,18 @@ inline ::proto::CatalogSnapshot* ProductMessage::release_catalog() {
 }
 inline ::proto::CatalogSnapshot* ProductMessage::unsafe_arena_release_catalog() {
   // @@protoc_insertion_point(field_release:proto.ProductMessage.catalog)
-  _has_bits_[0] &= ~0x00000004u;
-  ::proto::CatalogSnapshot* temp = catalog_;
-  catalog_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::proto::CatalogSnapshot* temp = _impl_.catalog_;
+  _impl_.catalog_ = nullptr;
   return temp;
 }
 inline ::proto::CatalogSnapshot* ProductMessage::_internal_mutable_catalog() {
-  _has_bits_[0] |= 0x00000004u;
-  if (catalog_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000004u;
+  if (_impl_.catalog_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::CatalogSnapshot>(GetArenaForAllocation());
-    catalog_ = p;
+    _impl_.catalog_ = p;
   }
-  return catalog_;
+  return _impl_.catalog_;
 }
 inline ::proto::CatalogSnapshot* ProductMessage::mutable_catalog() {
   ::proto::CatalogSnapshot* _msg = _internal_mutable_catalog();
@@ -40506,38 +42317,38 @@ inline ::proto::CatalogSnapshot* ProductMessage::mutable_catalog() {
 inline void ProductMessage::set_allocated_catalog(::proto::CatalogSnapshot* catalog) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete catalog_;
+    delete _impl_.catalog_;
   }
   if (catalog) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::CatalogSnapshot>::GetOwningArena(catalog);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(catalog);
     if (message_arena != submessage_arena) {
       catalog = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, catalog, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
-  catalog_ = catalog;
+  _impl_.catalog_ = catalog;
   // @@protoc_insertion_point(field_set_allocated:proto.ProductMessage.catalog)
 }
 
 // optional .proto.ContextInfo contextInfo = 17;
 inline bool ProductMessage::_internal_has_contextinfo() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
-  PROTOBUF_ASSUME(!value || contextinfo_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.contextinfo_ != nullptr);
   return value;
 }
 inline bool ProductMessage::has_contextinfo() const {
   return _internal_has_contextinfo();
 }
 inline void ProductMessage::clear_contextinfo() {
-  if (contextinfo_ != nullptr) contextinfo_->Clear();
-  _has_bits_[0] &= ~0x00000008u;
+  if (_impl_.contextinfo_ != nullptr) _impl_.contextinfo_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline const ::proto::ContextInfo& ProductMessage::_internal_contextinfo() const {
-  const ::proto::ContextInfo* p = contextinfo_;
+  const ::proto::ContextInfo* p = _impl_.contextinfo_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ContextInfo&>(
       ::proto::_ContextInfo_default_instance_);
 }
@@ -40548,20 +42359,20 @@ inline const ::proto::ContextInfo& ProductMessage::contextinfo() const {
 inline void ProductMessage::unsafe_arena_set_allocated_contextinfo(
     ::proto::ContextInfo* contextinfo) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(contextinfo_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.contextinfo_);
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   if (contextinfo) {
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.ProductMessage.contextInfo)
 }
 inline ::proto::ContextInfo* ProductMessage::release_contextinfo() {
-  _has_bits_[0] &= ~0x00000008u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -40575,18 +42386,18 @@ inline ::proto::ContextInfo* ProductMessage::release_contextinfo() {
 }
 inline ::proto::ContextInfo* ProductMessage::unsafe_arena_release_contextinfo() {
   // @@protoc_insertion_point(field_release:proto.ProductMessage.contextInfo)
-  _has_bits_[0] &= ~0x00000008u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
   return temp;
 }
 inline ::proto::ContextInfo* ProductMessage::_internal_mutable_contextinfo() {
-  _has_bits_[0] |= 0x00000008u;
-  if (contextinfo_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000008u;
+  if (_impl_.contextinfo_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ContextInfo>(GetArenaForAllocation());
-    contextinfo_ = p;
+    _impl_.contextinfo_ = p;
   }
-  return contextinfo_;
+  return _impl_.contextinfo_;
 }
 inline ::proto::ContextInfo* ProductMessage::mutable_contextinfo() {
   ::proto::ContextInfo* _msg = _internal_mutable_contextinfo();
@@ -40596,20 +42407,20 @@ inline ::proto::ContextInfo* ProductMessage::mutable_contextinfo() {
 inline void ProductMessage::set_allocated_contextinfo(::proto::ContextInfo* contextinfo) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete contextinfo_;
+    delete _impl_.contextinfo_;
   }
   if (contextinfo) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ContextInfo>::GetOwningArena(contextinfo);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(contextinfo);
     if (message_arena != submessage_arena) {
       contextinfo = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, contextinfo, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   // @@protoc_insertion_point(field_set_allocated:proto.ProductMessage.contextInfo)
 }
 
@@ -40619,15 +42430,15 @@ inline void ProductMessage::set_allocated_contextinfo(::proto::ContextInfo* cont
 
 // optional string orderId = 1;
 inline bool OrderMessage::_internal_has_orderid() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool OrderMessage::has_orderid() const {
   return _internal_has_orderid();
 }
 inline void OrderMessage::clear_orderid() {
-  orderid_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.orderid_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& OrderMessage::orderid() const {
   // @@protoc_insertion_point(field_get:proto.OrderMessage.orderId)
@@ -40636,8 +42447,8 @@ inline const std::string& OrderMessage::orderid() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void OrderMessage::set_orderid(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- orderid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.orderid_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.OrderMessage.orderId)
 }
 inline std::string* OrderMessage::mutable_orderid() {
@@ -40646,46 +42457,56 @@ inline std::string* OrderMessage::mutable_orderid() {
   return _s;
 }
 inline const std::string& OrderMessage::_internal_orderid() const {
-  return orderid_.Get();
+  return _impl_.orderid_.Get();
 }
 inline void OrderMessage::_internal_set_orderid(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  orderid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.orderid_.Set(value, GetArenaForAllocation());
 }
 inline std::string* OrderMessage::_internal_mutable_orderid() {
-  _has_bits_[0] |= 0x00000001u;
-  return orderid_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.orderid_.Mutable(GetArenaForAllocation());
 }
 inline std::string* OrderMessage::release_orderid() {
   // @@protoc_insertion_point(field_release:proto.OrderMessage.orderId)
   if (!_internal_has_orderid()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return orderid_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.orderid_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.orderid_.IsDefault()) {
+    _impl_.orderid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void OrderMessage::set_allocated_orderid(std::string* orderid) {
   if (orderid != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
+  }
+  _impl_.orderid_.SetAllocated(orderid, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.orderid_.IsDefault()) {
+    _impl_.orderid_.Set("", GetArenaForAllocation());
   }
-  orderid_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), orderid,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.OrderMessage.orderId)
 }
 
 // optional bytes thumbnail = 2;
 inline bool OrderMessage::_internal_has_thumbnail() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool OrderMessage::has_thumbnail() const {
   return _internal_has_thumbnail();
 }
 inline void OrderMessage::clear_thumbnail() {
-  thumbnail_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.thumbnail_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& OrderMessage::thumbnail() const {
   // @@protoc_insertion_point(field_get:proto.OrderMessage.thumbnail)
@@ -40694,8 +42515,8 @@ inline const std::string& OrderMessage::thumbnail() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void OrderMessage::set_thumbnail(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- thumbnail_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.thumbnail_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.OrderMessage.thumbnail)
 }
 inline std::string* OrderMessage::mutable_thumbnail() {
@@ -40704,77 +42525,87 @@ inline std::string* OrderMessage::mutable_thumbnail() {
   return _s;
 }
 inline const std::string& OrderMessage::_internal_thumbnail() const {
-  return thumbnail_.Get();
+  return _impl_.thumbnail_.Get();
 }
 inline void OrderMessage::_internal_set_thumbnail(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  thumbnail_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.thumbnail_.Set(value, GetArenaForAllocation());
 }
 inline std::string* OrderMessage::_internal_mutable_thumbnail() {
-  _has_bits_[0] |= 0x00000002u;
-  return thumbnail_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.thumbnail_.Mutable(GetArenaForAllocation());
 }
 inline std::string* OrderMessage::release_thumbnail() {
   // @@protoc_insertion_point(field_release:proto.OrderMessage.thumbnail)
   if (!_internal_has_thumbnail()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return thumbnail_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.thumbnail_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.thumbnail_.IsDefault()) {
+    _impl_.thumbnail_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void OrderMessage::set_allocated_thumbnail(std::string* thumbnail) {
   if (thumbnail != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
+  }
+  _impl_.thumbnail_.SetAllocated(thumbnail, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.thumbnail_.IsDefault()) {
+    _impl_.thumbnail_.Set("", GetArenaForAllocation());
   }
-  thumbnail_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), thumbnail,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.OrderMessage.thumbnail)
 }
 
 // optional int32 itemCount = 3;
 inline bool OrderMessage::_internal_has_itemcount() const {
-  bool value = (_has_bits_[0] & 0x00000200u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000200u) != 0;
   return value;
 }
 inline bool OrderMessage::has_itemcount() const {
   return _internal_has_itemcount();
 }
 inline void OrderMessage::clear_itemcount() {
-  itemcount_ = 0;
-  _has_bits_[0] &= ~0x00000200u;
+  _impl_.itemcount_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000200u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int32 OrderMessage::_internal_itemcount() const {
-  return itemcount_;
+inline int32_t OrderMessage::_internal_itemcount() const {
+  return _impl_.itemcount_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int32 OrderMessage::itemcount() const {
+inline int32_t OrderMessage::itemcount() const {
   // @@protoc_insertion_point(field_get:proto.OrderMessage.itemCount)
   return _internal_itemcount();
 }
-inline void OrderMessage::_internal_set_itemcount(::PROTOBUF_NAMESPACE_ID::int32 value) {
-  _has_bits_[0] |= 0x00000200u;
-  itemcount_ = value;
+inline void OrderMessage::_internal_set_itemcount(int32_t value) {
+  _impl_._has_bits_[0] |= 0x00000200u;
+  _impl_.itemcount_ = value;
 }
-inline void OrderMessage::set_itemcount(::PROTOBUF_NAMESPACE_ID::int32 value) {
+inline void OrderMessage::set_itemcount(int32_t value) {
   _internal_set_itemcount(value);
   // @@protoc_insertion_point(field_set:proto.OrderMessage.itemCount)
 }
 
 // optional .proto.OrderMessage.OrderMessageOrderStatus status = 4;
 inline bool OrderMessage::_internal_has_status() const {
-  bool value = (_has_bits_[0] & 0x00000400u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000400u) != 0;
   return value;
 }
 inline bool OrderMessage::has_status() const {
   return _internal_has_status();
 }
 inline void OrderMessage::clear_status() {
-  status_ = 1;
-  _has_bits_[0] &= ~0x00000400u;
+  _impl_.status_ = 1;
+  _impl_._has_bits_[0] &= ~0x00000400u;
 }
 inline ::proto::OrderMessage_OrderMessageOrderStatus OrderMessage::_internal_status() const {
-  return static_cast< ::proto::OrderMessage_OrderMessageOrderStatus >(status_);
+  return static_cast< ::proto::OrderMessage_OrderMessageOrderStatus >(_impl_.status_);
 }
 inline ::proto::OrderMessage_OrderMessageOrderStatus OrderMessage::status() const {
   // @@protoc_insertion_point(field_get:proto.OrderMessage.status)
@@ -40782,8 +42613,8 @@ inline ::proto::OrderMessage_OrderMessageOrderStatus OrderMessage::status() cons
 }
 inline void OrderMessage::_internal_set_status(::proto::OrderMessage_OrderMessageOrderStatus value) {
   assert(::proto::OrderMessage_OrderMessageOrderStatus_IsValid(value));
-  _has_bits_[0] |= 0x00000400u;
-  status_ = value;
+  _impl_._has_bits_[0] |= 0x00000400u;
+  _impl_.status_ = value;
 }
 inline void OrderMessage::set_status(::proto::OrderMessage_OrderMessageOrderStatus value) {
   _internal_set_status(value);
@@ -40792,18 +42623,18 @@ inline void OrderMessage::set_status(::proto::OrderMessage_OrderMessageOrderStat
 
 // optional .proto.OrderMessage.OrderMessageOrderSurface surface = 5;
 inline bool OrderMessage::_internal_has_surface() const {
-  bool value = (_has_bits_[0] & 0x00000800u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000800u) != 0;
   return value;
 }
 inline bool OrderMessage::has_surface() const {
   return _internal_has_surface();
 }
 inline void OrderMessage::clear_surface() {
-  surface_ = 1;
-  _has_bits_[0] &= ~0x00000800u;
+  _impl_.surface_ = 1;
+  _impl_._has_bits_[0] &= ~0x00000800u;
 }
 inline ::proto::OrderMessage_OrderMessageOrderSurface OrderMessage::_internal_surface() const {
-  return static_cast< ::proto::OrderMessage_OrderMessageOrderSurface >(surface_);
+  return static_cast< ::proto::OrderMessage_OrderMessageOrderSurface >(_impl_.surface_);
 }
 inline ::proto::OrderMessage_OrderMessageOrderSurface OrderMessage::surface() const {
   // @@protoc_insertion_point(field_get:proto.OrderMessage.surface)
@@ -40811,8 +42642,8 @@ inline ::proto::OrderMessage_OrderMessageOrderSurface OrderMessage::surface() co
 }
 inline void OrderMessage::_internal_set_surface(::proto::OrderMessage_OrderMessageOrderSurface value) {
   assert(::proto::OrderMessage_OrderMessageOrderSurface_IsValid(value));
-  _has_bits_[0] |= 0x00000800u;
-  surface_ = value;
+  _impl_._has_bits_[0] |= 0x00000800u;
+  _impl_.surface_ = value;
 }
 inline void OrderMessage::set_surface(::proto::OrderMessage_OrderMessageOrderSurface value) {
   _internal_set_surface(value);
@@ -40821,15 +42652,15 @@ inline void OrderMessage::set_surface(::proto::OrderMessage_OrderMessageOrderSur
 
 // optional string message = 6;
 inline bool OrderMessage::_internal_has_message() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool OrderMessage::has_message() const {
   return _internal_has_message();
 }
 inline void OrderMessage::clear_message() {
-  message_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.message_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const std::string& OrderMessage::message() const {
   // @@protoc_insertion_point(field_get:proto.OrderMessage.message)
@@ -40838,8 +42669,8 @@ inline const std::string& OrderMessage::message() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void OrderMessage::set_message(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000004u;
- message_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000004u;
+ _impl_.message_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.OrderMessage.message)
 }
 inline std::string* OrderMessage::mutable_message() {
@@ -40848,46 +42679,56 @@ inline std::string* OrderMessage::mutable_message() {
   return _s;
 }
 inline const std::string& OrderMessage::_internal_message() const {
-  return message_.Get();
+  return _impl_.message_.Get();
 }
 inline void OrderMessage::_internal_set_message(const std::string& value) {
-  _has_bits_[0] |= 0x00000004u;
-  message_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.message_.Set(value, GetArenaForAllocation());
 }
 inline std::string* OrderMessage::_internal_mutable_message() {
-  _has_bits_[0] |= 0x00000004u;
-  return message_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  return _impl_.message_.Mutable(GetArenaForAllocation());
 }
 inline std::string* OrderMessage::release_message() {
   // @@protoc_insertion_point(field_release:proto.OrderMessage.message)
   if (!_internal_has_message()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000004u;
-  return message_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  auto* p = _impl_.message_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.message_.IsDefault()) {
+    _impl_.message_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void OrderMessage::set_allocated_message(std::string* message) {
   if (message != nullptr) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
+  }
+  _impl_.message_.SetAllocated(message, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.message_.IsDefault()) {
+    _impl_.message_.Set("", GetArenaForAllocation());
   }
-  message_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), message,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.OrderMessage.message)
 }
 
 // optional string orderTitle = 7;
 inline bool OrderMessage::_internal_has_ordertitle() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool OrderMessage::has_ordertitle() const {
   return _internal_has_ordertitle();
 }
 inline void OrderMessage::clear_ordertitle() {
-  ordertitle_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.ordertitle_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline const std::string& OrderMessage::ordertitle() const {
   // @@protoc_insertion_point(field_get:proto.OrderMessage.orderTitle)
@@ -40896,8 +42737,8 @@ inline const std::string& OrderMessage::ordertitle() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void OrderMessage::set_ordertitle(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000008u;
- ordertitle_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000008u;
+ _impl_.ordertitle_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.OrderMessage.orderTitle)
 }
 inline std::string* OrderMessage::mutable_ordertitle() {
@@ -40906,46 +42747,56 @@ inline std::string* OrderMessage::mutable_ordertitle() {
   return _s;
 }
 inline const std::string& OrderMessage::_internal_ordertitle() const {
-  return ordertitle_.Get();
+  return _impl_.ordertitle_.Get();
 }
 inline void OrderMessage::_internal_set_ordertitle(const std::string& value) {
-  _has_bits_[0] |= 0x00000008u;
-  ordertitle_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.ordertitle_.Set(value, GetArenaForAllocation());
 }
 inline std::string* OrderMessage::_internal_mutable_ordertitle() {
-  _has_bits_[0] |= 0x00000008u;
-  return ordertitle_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  return _impl_.ordertitle_.Mutable(GetArenaForAllocation());
 }
 inline std::string* OrderMessage::release_ordertitle() {
   // @@protoc_insertion_point(field_release:proto.OrderMessage.orderTitle)
   if (!_internal_has_ordertitle()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000008u;
-  return ordertitle_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  auto* p = _impl_.ordertitle_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.ordertitle_.IsDefault()) {
+    _impl_.ordertitle_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void OrderMessage::set_allocated_ordertitle(std::string* ordertitle) {
   if (ordertitle != nullptr) {
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
+  }
+  _impl_.ordertitle_.SetAllocated(ordertitle, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.ordertitle_.IsDefault()) {
+    _impl_.ordertitle_.Set("", GetArenaForAllocation());
   }
-  ordertitle_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ordertitle,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.OrderMessage.orderTitle)
 }
 
 // optional string sellerJid = 8;
 inline bool OrderMessage::_internal_has_sellerjid() const {
-  bool value = (_has_bits_[0] & 0x00000010u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
   return value;
 }
 inline bool OrderMessage::has_sellerjid() const {
   return _internal_has_sellerjid();
 }
 inline void OrderMessage::clear_sellerjid() {
-  sellerjid_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000010u;
+  _impl_.sellerjid_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000010u;
 }
 inline const std::string& OrderMessage::sellerjid() const {
   // @@protoc_insertion_point(field_get:proto.OrderMessage.sellerJid)
@@ -40954,8 +42805,8 @@ inline const std::string& OrderMessage::sellerjid() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void OrderMessage::set_sellerjid(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000010u;
- sellerjid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000010u;
+ _impl_.sellerjid_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.OrderMessage.sellerJid)
 }
 inline std::string* OrderMessage::mutable_sellerjid() {
@@ -40964,46 +42815,56 @@ inline std::string* OrderMessage::mutable_sellerjid() {
   return _s;
 }
 inline const std::string& OrderMessage::_internal_sellerjid() const {
-  return sellerjid_.Get();
+  return _impl_.sellerjid_.Get();
 }
 inline void OrderMessage::_internal_set_sellerjid(const std::string& value) {
-  _has_bits_[0] |= 0x00000010u;
-  sellerjid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  _impl_.sellerjid_.Set(value, GetArenaForAllocation());
 }
 inline std::string* OrderMessage::_internal_mutable_sellerjid() {
-  _has_bits_[0] |= 0x00000010u;
-  return sellerjid_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  return _impl_.sellerjid_.Mutable(GetArenaForAllocation());
 }
 inline std::string* OrderMessage::release_sellerjid() {
   // @@protoc_insertion_point(field_release:proto.OrderMessage.sellerJid)
   if (!_internal_has_sellerjid()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000010u;
-  return sellerjid_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000010u;
+  auto* p = _impl_.sellerjid_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.sellerjid_.IsDefault()) {
+    _impl_.sellerjid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void OrderMessage::set_allocated_sellerjid(std::string* sellerjid) {
   if (sellerjid != nullptr) {
-    _has_bits_[0] |= 0x00000010u;
+    _impl_._has_bits_[0] |= 0x00000010u;
   } else {
-    _has_bits_[0] &= ~0x00000010u;
+    _impl_._has_bits_[0] &= ~0x00000010u;
+  }
+  _impl_.sellerjid_.SetAllocated(sellerjid, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.sellerjid_.IsDefault()) {
+    _impl_.sellerjid_.Set("", GetArenaForAllocation());
   }
-  sellerjid_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), sellerjid,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.OrderMessage.sellerJid)
 }
 
 // optional string token = 9;
 inline bool OrderMessage::_internal_has_token() const {
-  bool value = (_has_bits_[0] & 0x00000020u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
   return value;
 }
 inline bool OrderMessage::has_token() const {
   return _internal_has_token();
 }
 inline void OrderMessage::clear_token() {
-  token_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000020u;
+  _impl_.token_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000020u;
 }
 inline const std::string& OrderMessage::token() const {
   // @@protoc_insertion_point(field_get:proto.OrderMessage.token)
@@ -41012,8 +42873,8 @@ inline const std::string& OrderMessage::token() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void OrderMessage::set_token(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000020u;
- token_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000020u;
+ _impl_.token_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.OrderMessage.token)
 }
 inline std::string* OrderMessage::mutable_token() {
@@ -41022,74 +42883,84 @@ inline std::string* OrderMessage::mutable_token() {
   return _s;
 }
 inline const std::string& OrderMessage::_internal_token() const {
-  return token_.Get();
+  return _impl_.token_.Get();
 }
 inline void OrderMessage::_internal_set_token(const std::string& value) {
-  _has_bits_[0] |= 0x00000020u;
-  token_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000020u;
+  _impl_.token_.Set(value, GetArenaForAllocation());
 }
 inline std::string* OrderMessage::_internal_mutable_token() {
-  _has_bits_[0] |= 0x00000020u;
-  return token_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000020u;
+  return _impl_.token_.Mutable(GetArenaForAllocation());
 }
 inline std::string* OrderMessage::release_token() {
   // @@protoc_insertion_point(field_release:proto.OrderMessage.token)
   if (!_internal_has_token()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000020u;
-  return token_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000020u;
+  auto* p = _impl_.token_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.token_.IsDefault()) {
+    _impl_.token_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void OrderMessage::set_allocated_token(std::string* token) {
   if (token != nullptr) {
-    _has_bits_[0] |= 0x00000020u;
+    _impl_._has_bits_[0] |= 0x00000020u;
   } else {
-    _has_bits_[0] &= ~0x00000020u;
+    _impl_._has_bits_[0] &= ~0x00000020u;
   }
-  token_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), token,
-      GetArenaForAllocation());
+  _impl_.token_.SetAllocated(token, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.token_.IsDefault()) {
+    _impl_.token_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.OrderMessage.token)
 }
 
 // optional int64 totalAmount1000 = 10;
 inline bool OrderMessage::_internal_has_totalamount1000() const {
-  bool value = (_has_bits_[0] & 0x00000100u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000100u) != 0;
   return value;
 }
 inline bool OrderMessage::has_totalamount1000() const {
   return _internal_has_totalamount1000();
 }
 inline void OrderMessage::clear_totalamount1000() {
-  totalamount1000_ = int64_t{0};
-  _has_bits_[0] &= ~0x00000100u;
+  _impl_.totalamount1000_ = int64_t{0};
+  _impl_._has_bits_[0] &= ~0x00000100u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 OrderMessage::_internal_totalamount1000() const {
-  return totalamount1000_;
+inline int64_t OrderMessage::_internal_totalamount1000() const {
+  return _impl_.totalamount1000_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 OrderMessage::totalamount1000() const {
+inline int64_t OrderMessage::totalamount1000() const {
   // @@protoc_insertion_point(field_get:proto.OrderMessage.totalAmount1000)
   return _internal_totalamount1000();
 }
-inline void OrderMessage::_internal_set_totalamount1000(::PROTOBUF_NAMESPACE_ID::int64 value) {
-  _has_bits_[0] |= 0x00000100u;
-  totalamount1000_ = value;
+inline void OrderMessage::_internal_set_totalamount1000(int64_t value) {
+  _impl_._has_bits_[0] |= 0x00000100u;
+  _impl_.totalamount1000_ = value;
 }
-inline void OrderMessage::set_totalamount1000(::PROTOBUF_NAMESPACE_ID::int64 value) {
+inline void OrderMessage::set_totalamount1000(int64_t value) {
   _internal_set_totalamount1000(value);
   // @@protoc_insertion_point(field_set:proto.OrderMessage.totalAmount1000)
 }
 
 // optional string totalCurrencyCode = 11;
 inline bool OrderMessage::_internal_has_totalcurrencycode() const {
-  bool value = (_has_bits_[0] & 0x00000040u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
   return value;
 }
 inline bool OrderMessage::has_totalcurrencycode() const {
   return _internal_has_totalcurrencycode();
 }
 inline void OrderMessage::clear_totalcurrencycode() {
-  totalcurrencycode_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000040u;
+  _impl_.totalcurrencycode_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000040u;
 }
 inline const std::string& OrderMessage::totalcurrencycode() const {
   // @@protoc_insertion_point(field_get:proto.OrderMessage.totalCurrencyCode)
@@ -41098,8 +42969,8 @@ inline const std::string& OrderMessage::totalcurrencycode() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void OrderMessage::set_totalcurrencycode(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000040u;
- totalcurrencycode_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000040u;
+ _impl_.totalcurrencycode_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.OrderMessage.totalCurrencyCode)
 }
 inline std::string* OrderMessage::mutable_totalcurrencycode() {
@@ -41108,50 +42979,60 @@ inline std::string* OrderMessage::mutable_totalcurrencycode() {
   return _s;
 }
 inline const std::string& OrderMessage::_internal_totalcurrencycode() const {
-  return totalcurrencycode_.Get();
+  return _impl_.totalcurrencycode_.Get();
 }
 inline void OrderMessage::_internal_set_totalcurrencycode(const std::string& value) {
-  _has_bits_[0] |= 0x00000040u;
-  totalcurrencycode_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000040u;
+  _impl_.totalcurrencycode_.Set(value, GetArenaForAllocation());
 }
 inline std::string* OrderMessage::_internal_mutable_totalcurrencycode() {
-  _has_bits_[0] |= 0x00000040u;
-  return totalcurrencycode_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000040u;
+  return _impl_.totalcurrencycode_.Mutable(GetArenaForAllocation());
 }
 inline std::string* OrderMessage::release_totalcurrencycode() {
   // @@protoc_insertion_point(field_release:proto.OrderMessage.totalCurrencyCode)
   if (!_internal_has_totalcurrencycode()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000040u;
-  return totalcurrencycode_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000040u;
+  auto* p = _impl_.totalcurrencycode_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.totalcurrencycode_.IsDefault()) {
+    _impl_.totalcurrencycode_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void OrderMessage::set_allocated_totalcurrencycode(std::string* totalcurrencycode) {
   if (totalcurrencycode != nullptr) {
-    _has_bits_[0] |= 0x00000040u;
+    _impl_._has_bits_[0] |= 0x00000040u;
   } else {
-    _has_bits_[0] &= ~0x00000040u;
+    _impl_._has_bits_[0] &= ~0x00000040u;
   }
-  totalcurrencycode_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), totalcurrencycode,
-      GetArenaForAllocation());
+  _impl_.totalcurrencycode_.SetAllocated(totalcurrencycode, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.totalcurrencycode_.IsDefault()) {
+    _impl_.totalcurrencycode_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.OrderMessage.totalCurrencyCode)
 }
 
 // optional .proto.ContextInfo contextInfo = 17;
 inline bool OrderMessage::_internal_has_contextinfo() const {
-  bool value = (_has_bits_[0] & 0x00000080u) != 0;
-  PROTOBUF_ASSUME(!value || contextinfo_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000080u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.contextinfo_ != nullptr);
   return value;
 }
 inline bool OrderMessage::has_contextinfo() const {
   return _internal_has_contextinfo();
 }
 inline void OrderMessage::clear_contextinfo() {
-  if (contextinfo_ != nullptr) contextinfo_->Clear();
-  _has_bits_[0] &= ~0x00000080u;
+  if (_impl_.contextinfo_ != nullptr) _impl_.contextinfo_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000080u;
 }
 inline const ::proto::ContextInfo& OrderMessage::_internal_contextinfo() const {
-  const ::proto::ContextInfo* p = contextinfo_;
+  const ::proto::ContextInfo* p = _impl_.contextinfo_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ContextInfo&>(
       ::proto::_ContextInfo_default_instance_);
 }
@@ -41162,20 +43043,20 @@ inline const ::proto::ContextInfo& OrderMessage::contextinfo() const {
 inline void OrderMessage::unsafe_arena_set_allocated_contextinfo(
     ::proto::ContextInfo* contextinfo) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(contextinfo_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.contextinfo_);
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   if (contextinfo) {
-    _has_bits_[0] |= 0x00000080u;
+    _impl_._has_bits_[0] |= 0x00000080u;
   } else {
-    _has_bits_[0] &= ~0x00000080u;
+    _impl_._has_bits_[0] &= ~0x00000080u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.OrderMessage.contextInfo)
 }
 inline ::proto::ContextInfo* OrderMessage::release_contextinfo() {
-  _has_bits_[0] &= ~0x00000080u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000080u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -41189,18 +43070,18 @@ inline ::proto::ContextInfo* OrderMessage::release_contextinfo() {
 }
 inline ::proto::ContextInfo* OrderMessage::unsafe_arena_release_contextinfo() {
   // @@protoc_insertion_point(field_release:proto.OrderMessage.contextInfo)
-  _has_bits_[0] &= ~0x00000080u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000080u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
   return temp;
 }
 inline ::proto::ContextInfo* OrderMessage::_internal_mutable_contextinfo() {
-  _has_bits_[0] |= 0x00000080u;
-  if (contextinfo_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000080u;
+  if (_impl_.contextinfo_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ContextInfo>(GetArenaForAllocation());
-    contextinfo_ = p;
+    _impl_.contextinfo_ = p;
   }
-  return contextinfo_;
+  return _impl_.contextinfo_;
 }
 inline ::proto::ContextInfo* OrderMessage::mutable_contextinfo() {
   ::proto::ContextInfo* _msg = _internal_mutable_contextinfo();
@@ -41210,20 +43091,20 @@ inline ::proto::ContextInfo* OrderMessage::mutable_contextinfo() {
 inline void OrderMessage::set_allocated_contextinfo(::proto::ContextInfo* contextinfo) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete contextinfo_;
+    delete _impl_.contextinfo_;
   }
   if (contextinfo) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ContextInfo>::GetOwningArena(contextinfo);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(contextinfo);
     if (message_arena != submessage_arena) {
       contextinfo = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, contextinfo, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000080u;
+    _impl_._has_bits_[0] |= 0x00000080u;
   } else {
-    _has_bits_[0] &= ~0x00000080u;
+    _impl_._has_bits_[0] &= ~0x00000080u;
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   // @@protoc_insertion_point(field_set_allocated:proto.OrderMessage.contextInfo)
 }
 
@@ -41233,15 +43114,15 @@ inline void OrderMessage::set_allocated_contextinfo(::proto::ContextInfo* contex
 
 // optional string title = 1;
 inline bool Row::_internal_has_title() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool Row::has_title() const {
   return _internal_has_title();
 }
 inline void Row::clear_title() {
-  title_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.title_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& Row::title() const {
   // @@protoc_insertion_point(field_get:proto.Row.title)
@@ -41250,8 +43131,8 @@ inline const std::string& Row::title() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void Row::set_title(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- title_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.title_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.Row.title)
 }
 inline std::string* Row::mutable_title() {
@@ -41260,46 +43141,56 @@ inline std::string* Row::mutable_title() {
   return _s;
 }
 inline const std::string& Row::_internal_title() const {
-  return title_.Get();
+  return _impl_.title_.Get();
 }
 inline void Row::_internal_set_title(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  title_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.title_.Set(value, GetArenaForAllocation());
 }
 inline std::string* Row::_internal_mutable_title() {
-  _has_bits_[0] |= 0x00000001u;
-  return title_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.title_.Mutable(GetArenaForAllocation());
 }
 inline std::string* Row::release_title() {
   // @@protoc_insertion_point(field_release:proto.Row.title)
   if (!_internal_has_title()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return title_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.title_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.title_.IsDefault()) {
+    _impl_.title_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void Row::set_allocated_title(std::string* title) {
   if (title != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  title_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), title,
-      GetArenaForAllocation());
+  _impl_.title_.SetAllocated(title, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.title_.IsDefault()) {
+    _impl_.title_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.Row.title)
 }
 
 // optional string description = 2;
 inline bool Row::_internal_has_description() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool Row::has_description() const {
   return _internal_has_description();
 }
 inline void Row::clear_description() {
-  description_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.description_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& Row::description() const {
   // @@protoc_insertion_point(field_get:proto.Row.description)
@@ -41308,8 +43199,8 @@ inline const std::string& Row::description() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void Row::set_description(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- description_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.description_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.Row.description)
 }
 inline std::string* Row::mutable_description() {
@@ -41318,46 +43209,56 @@ inline std::string* Row::mutable_description() {
   return _s;
 }
 inline const std::string& Row::_internal_description() const {
-  return description_.Get();
+  return _impl_.description_.Get();
 }
 inline void Row::_internal_set_description(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  description_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.description_.Set(value, GetArenaForAllocation());
 }
 inline std::string* Row::_internal_mutable_description() {
-  _has_bits_[0] |= 0x00000002u;
-  return description_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.description_.Mutable(GetArenaForAllocation());
 }
 inline std::string* Row::release_description() {
   // @@protoc_insertion_point(field_release:proto.Row.description)
   if (!_internal_has_description()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return description_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.description_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.description_.IsDefault()) {
+    _impl_.description_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void Row::set_allocated_description(std::string* description) {
   if (description != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
+  }
+  _impl_.description_.SetAllocated(description, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.description_.IsDefault()) {
+    _impl_.description_.Set("", GetArenaForAllocation());
   }
-  description_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), description,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.Row.description)
 }
 
 // optional string rowId = 3;
 inline bool Row::_internal_has_rowid() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool Row::has_rowid() const {
   return _internal_has_rowid();
 }
 inline void Row::clear_rowid() {
-  rowid_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.rowid_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const std::string& Row::rowid() const {
   // @@protoc_insertion_point(field_get:proto.Row.rowId)
@@ -41366,8 +43267,8 @@ inline const std::string& Row::rowid() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void Row::set_rowid(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000004u;
- rowid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000004u;
+ _impl_.rowid_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.Row.rowId)
 }
 inline std::string* Row::mutable_rowid() {
@@ -41376,32 +43277,42 @@ inline std::string* Row::mutable_rowid() {
   return _s;
 }
 inline const std::string& Row::_internal_rowid() const {
-  return rowid_.Get();
+  return _impl_.rowid_.Get();
 }
 inline void Row::_internal_set_rowid(const std::string& value) {
-  _has_bits_[0] |= 0x00000004u;
-  rowid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.rowid_.Set(value, GetArenaForAllocation());
 }
 inline std::string* Row::_internal_mutable_rowid() {
-  _has_bits_[0] |= 0x00000004u;
-  return rowid_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  return _impl_.rowid_.Mutable(GetArenaForAllocation());
 }
 inline std::string* Row::release_rowid() {
   // @@protoc_insertion_point(field_release:proto.Row.rowId)
   if (!_internal_has_rowid()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000004u;
-  return rowid_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  auto* p = _impl_.rowid_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.rowid_.IsDefault()) {
+    _impl_.rowid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void Row::set_allocated_rowid(std::string* rowid) {
   if (rowid != nullptr) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
+  }
+  _impl_.rowid_.SetAllocated(rowid, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.rowid_.IsDefault()) {
+    _impl_.rowid_.Set("", GetArenaForAllocation());
   }
-  rowid_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), rowid,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.Row.rowId)
 }
 
@@ -41411,15 +43322,15 @@ inline void Row::set_allocated_rowid(std::string* rowid) {
 
 // optional string title = 1;
 inline bool Section::_internal_has_title() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool Section::has_title() const {
   return _internal_has_title();
 }
 inline void Section::clear_title() {
-  title_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.title_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& Section::title() const {
   // @@protoc_insertion_point(field_get:proto.Section.title)
@@ -41428,8 +43339,8 @@ inline const std::string& Section::title() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void Section::set_title(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- title_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.title_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.Section.title)
 }
 inline std::string* Section::mutable_title() {
@@ -41438,63 +43349,73 @@ inline std::string* Section::mutable_title() {
   return _s;
 }
 inline const std::string& Section::_internal_title() const {
-  return title_.Get();
+  return _impl_.title_.Get();
 }
 inline void Section::_internal_set_title(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  title_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.title_.Set(value, GetArenaForAllocation());
 }
 inline std::string* Section::_internal_mutable_title() {
-  _has_bits_[0] |= 0x00000001u;
-  return title_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.title_.Mutable(GetArenaForAllocation());
 }
 inline std::string* Section::release_title() {
   // @@protoc_insertion_point(field_release:proto.Section.title)
   if (!_internal_has_title()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return title_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.title_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.title_.IsDefault()) {
+    _impl_.title_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void Section::set_allocated_title(std::string* title) {
   if (title != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
+  }
+  _impl_.title_.SetAllocated(title, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.title_.IsDefault()) {
+    _impl_.title_.Set("", GetArenaForAllocation());
   }
-  title_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), title,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.Section.title)
 }
 
 // repeated .proto.Row rows = 2;
 inline int Section::_internal_rows_size() const {
-  return rows_.size();
+  return _impl_.rows_.size();
 }
 inline int Section::rows_size() const {
   return _internal_rows_size();
 }
 inline void Section::clear_rows() {
-  rows_.Clear();
+  _impl_.rows_.Clear();
 }
 inline ::proto::Row* Section::mutable_rows(int index) {
   // @@protoc_insertion_point(field_mutable:proto.Section.rows)
-  return rows_.Mutable(index);
+  return _impl_.rows_.Mutable(index);
 }
 inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::Row >*
 Section::mutable_rows() {
   // @@protoc_insertion_point(field_mutable_list:proto.Section.rows)
-  return &rows_;
+  return &_impl_.rows_;
 }
 inline const ::proto::Row& Section::_internal_rows(int index) const {
-  return rows_.Get(index);
+  return _impl_.rows_.Get(index);
 }
 inline const ::proto::Row& Section::rows(int index) const {
   // @@protoc_insertion_point(field_get:proto.Section.rows)
   return _internal_rows(index);
 }
 inline ::proto::Row* Section::_internal_add_rows() {
-  return rows_.Add();
+  return _impl_.rows_.Add();
 }
 inline ::proto::Row* Section::add_rows() {
   ::proto::Row* _add = _internal_add_rows();
@@ -41504,7 +43425,7 @@ inline ::proto::Row* Section::add_rows() {
 inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::Row >&
 Section::rows() const {
   // @@protoc_insertion_point(field_list:proto.Section.rows)
-  return rows_;
+  return _impl_.rows_;
 }
 
 // -------------------------------------------------------------------
@@ -41513,15 +43434,15 @@ Section::rows() const {
 
 // optional string title = 1;
 inline bool ListMessage::_internal_has_title() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool ListMessage::has_title() const {
   return _internal_has_title();
 }
 inline void ListMessage::clear_title() {
-  title_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.title_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& ListMessage::title() const {
   // @@protoc_insertion_point(field_get:proto.ListMessage.title)
@@ -41530,8 +43451,8 @@ inline const std::string& ListMessage::title() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ListMessage::set_title(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- title_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.title_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ListMessage.title)
 }
 inline std::string* ListMessage::mutable_title() {
@@ -41540,46 +43461,56 @@ inline std::string* ListMessage::mutable_title() {
   return _s;
 }
 inline const std::string& ListMessage::_internal_title() const {
-  return title_.Get();
+  return _impl_.title_.Get();
 }
 inline void ListMessage::_internal_set_title(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  title_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.title_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ListMessage::_internal_mutable_title() {
-  _has_bits_[0] |= 0x00000001u;
-  return title_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.title_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ListMessage::release_title() {
   // @@protoc_insertion_point(field_release:proto.ListMessage.title)
   if (!_internal_has_title()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return title_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.title_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.title_.IsDefault()) {
+    _impl_.title_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ListMessage::set_allocated_title(std::string* title) {
   if (title != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
+  }
+  _impl_.title_.SetAllocated(title, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.title_.IsDefault()) {
+    _impl_.title_.Set("", GetArenaForAllocation());
   }
-  title_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), title,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ListMessage.title)
 }
 
 // optional string description = 2;
 inline bool ListMessage::_internal_has_description() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool ListMessage::has_description() const {
   return _internal_has_description();
 }
 inline void ListMessage::clear_description() {
-  description_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.description_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& ListMessage::description() const {
   // @@protoc_insertion_point(field_get:proto.ListMessage.description)
@@ -41588,8 +43519,8 @@ inline const std::string& ListMessage::description() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ListMessage::set_description(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- description_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.description_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ListMessage.description)
 }
 inline std::string* ListMessage::mutable_description() {
@@ -41598,46 +43529,56 @@ inline std::string* ListMessage::mutable_description() {
   return _s;
 }
 inline const std::string& ListMessage::_internal_description() const {
-  return description_.Get();
+  return _impl_.description_.Get();
 }
 inline void ListMessage::_internal_set_description(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  description_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.description_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ListMessage::_internal_mutable_description() {
-  _has_bits_[0] |= 0x00000002u;
-  return description_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.description_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ListMessage::release_description() {
   // @@protoc_insertion_point(field_release:proto.ListMessage.description)
   if (!_internal_has_description()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return description_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.description_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.description_.IsDefault()) {
+    _impl_.description_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ListMessage::set_allocated_description(std::string* description) {
   if (description != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  description_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), description,
-      GetArenaForAllocation());
+  _impl_.description_.SetAllocated(description, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.description_.IsDefault()) {
+    _impl_.description_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ListMessage.description)
 }
 
 // optional string buttonText = 3;
 inline bool ListMessage::_internal_has_buttontext() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool ListMessage::has_buttontext() const {
   return _internal_has_buttontext();
 }
 inline void ListMessage::clear_buttontext() {
-  buttontext_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.buttontext_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const std::string& ListMessage::buttontext() const {
   // @@protoc_insertion_point(field_get:proto.ListMessage.buttonText)
@@ -41646,8 +43587,8 @@ inline const std::string& ListMessage::buttontext() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ListMessage::set_buttontext(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000004u;
- buttontext_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000004u;
+ _impl_.buttontext_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ListMessage.buttonText)
 }
 inline std::string* ListMessage::mutable_buttontext() {
@@ -41656,49 +43597,59 @@ inline std::string* ListMessage::mutable_buttontext() {
   return _s;
 }
 inline const std::string& ListMessage::_internal_buttontext() const {
-  return buttontext_.Get();
+  return _impl_.buttontext_.Get();
 }
 inline void ListMessage::_internal_set_buttontext(const std::string& value) {
-  _has_bits_[0] |= 0x00000004u;
-  buttontext_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.buttontext_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ListMessage::_internal_mutable_buttontext() {
-  _has_bits_[0] |= 0x00000004u;
-  return buttontext_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  return _impl_.buttontext_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ListMessage::release_buttontext() {
   // @@protoc_insertion_point(field_release:proto.ListMessage.buttonText)
   if (!_internal_has_buttontext()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000004u;
-  return buttontext_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  auto* p = _impl_.buttontext_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.buttontext_.IsDefault()) {
+    _impl_.buttontext_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ListMessage::set_allocated_buttontext(std::string* buttontext) {
   if (buttontext != nullptr) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
-  buttontext_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), buttontext,
-      GetArenaForAllocation());
+  _impl_.buttontext_.SetAllocated(buttontext, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.buttontext_.IsDefault()) {
+    _impl_.buttontext_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ListMessage.buttonText)
 }
 
 // optional .proto.ListMessage.ListMessageListType listType = 4;
 inline bool ListMessage::_internal_has_listtype() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool ListMessage::has_listtype() const {
   return _internal_has_listtype();
 }
 inline void ListMessage::clear_listtype() {
-  listtype_ = 0;
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.listtype_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline ::proto::ListMessage_ListMessageListType ListMessage::_internal_listtype() const {
-  return static_cast< ::proto::ListMessage_ListMessageListType >(listtype_);
+  return static_cast< ::proto::ListMessage_ListMessageListType >(_impl_.listtype_);
 }
 inline ::proto::ListMessage_ListMessageListType ListMessage::listtype() const {
   // @@protoc_insertion_point(field_get:proto.ListMessage.listType)
@@ -41706,8 +43657,8 @@ inline ::proto::ListMessage_ListMessageListType ListMessage::listtype() const {
 }
 inline void ListMessage::_internal_set_listtype(::proto::ListMessage_ListMessageListType value) {
   assert(::proto::ListMessage_ListMessageListType_IsValid(value));
-  _has_bits_[0] |= 0x00000008u;
-  listtype_ = value;
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.listtype_ = value;
 }
 inline void ListMessage::set_listtype(::proto::ListMessage_ListMessageListType value) {
   _internal_set_listtype(value);
@@ -41716,32 +43667,32 @@ inline void ListMessage::set_listtype(::proto::ListMessage_ListMessageListType v
 
 // repeated .proto.Section sections = 5;
 inline int ListMessage::_internal_sections_size() const {
-  return sections_.size();
+  return _impl_.sections_.size();
 }
 inline int ListMessage::sections_size() const {
   return _internal_sections_size();
 }
 inline void ListMessage::clear_sections() {
-  sections_.Clear();
+  _impl_.sections_.Clear();
 }
 inline ::proto::Section* ListMessage::mutable_sections(int index) {
   // @@protoc_insertion_point(field_mutable:proto.ListMessage.sections)
-  return sections_.Mutable(index);
+  return _impl_.sections_.Mutable(index);
 }
 inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::Section >*
 ListMessage::mutable_sections() {
   // @@protoc_insertion_point(field_mutable_list:proto.ListMessage.sections)
-  return &sections_;
+  return &_impl_.sections_;
 }
 inline const ::proto::Section& ListMessage::_internal_sections(int index) const {
-  return sections_.Get(index);
+  return _impl_.sections_.Get(index);
 }
 inline const ::proto::Section& ListMessage::sections(int index) const {
   // @@protoc_insertion_point(field_get:proto.ListMessage.sections)
   return _internal_sections(index);
 }
 inline ::proto::Section* ListMessage::_internal_add_sections() {
-  return sections_.Add();
+  return _impl_.sections_.Add();
 }
 inline ::proto::Section* ListMessage::add_sections() {
   ::proto::Section* _add = _internal_add_sections();
@@ -41751,7 +43702,7 @@ inline ::proto::Section* ListMessage::add_sections() {
 inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::Section >&
 ListMessage::sections() const {
   // @@protoc_insertion_point(field_list:proto.ListMessage.sections)
-  return sections_;
+  return _impl_.sections_;
 }
 
 // -------------------------------------------------------------------
@@ -41760,15 +43711,15 @@ ListMessage::sections() const {
 
 // optional string selectedRowId = 1;
 inline bool SingleSelectReply::_internal_has_selectedrowid() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool SingleSelectReply::has_selectedrowid() const {
   return _internal_has_selectedrowid();
 }
 inline void SingleSelectReply::clear_selectedrowid() {
-  selectedrowid_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.selectedrowid_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& SingleSelectReply::selectedrowid() const {
   // @@protoc_insertion_point(field_get:proto.SingleSelectReply.selectedRowId)
@@ -41777,8 +43728,8 @@ inline const std::string& SingleSelectReply::selectedrowid() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void SingleSelectReply::set_selectedrowid(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- selectedrowid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.selectedrowid_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.SingleSelectReply.selectedRowId)
 }
 inline std::string* SingleSelectReply::mutable_selectedrowid() {
@@ -41787,32 +43738,42 @@ inline std::string* SingleSelectReply::mutable_selectedrowid() {
   return _s;
 }
 inline const std::string& SingleSelectReply::_internal_selectedrowid() const {
-  return selectedrowid_.Get();
+  return _impl_.selectedrowid_.Get();
 }
 inline void SingleSelectReply::_internal_set_selectedrowid(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  selectedrowid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.selectedrowid_.Set(value, GetArenaForAllocation());
 }
 inline std::string* SingleSelectReply::_internal_mutable_selectedrowid() {
-  _has_bits_[0] |= 0x00000001u;
-  return selectedrowid_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.selectedrowid_.Mutable(GetArenaForAllocation());
 }
 inline std::string* SingleSelectReply::release_selectedrowid() {
   // @@protoc_insertion_point(field_release:proto.SingleSelectReply.selectedRowId)
   if (!_internal_has_selectedrowid()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return selectedrowid_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.selectedrowid_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.selectedrowid_.IsDefault()) {
+    _impl_.selectedrowid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void SingleSelectReply::set_allocated_selectedrowid(std::string* selectedrowid) {
   if (selectedrowid != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  selectedrowid_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), selectedrowid,
-      GetArenaForAllocation());
+  _impl_.selectedrowid_.SetAllocated(selectedrowid, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.selectedrowid_.IsDefault()) {
+    _impl_.selectedrowid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.SingleSelectReply.selectedRowId)
 }
 
@@ -41822,15 +43783,15 @@ inline void SingleSelectReply::set_allocated_selectedrowid(std::string* selected
 
 // optional string title = 1;
 inline bool ListResponseMessage::_internal_has_title() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool ListResponseMessage::has_title() const {
   return _internal_has_title();
 }
 inline void ListResponseMessage::clear_title() {
-  title_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.title_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& ListResponseMessage::title() const {
   // @@protoc_insertion_point(field_get:proto.ListResponseMessage.title)
@@ -41839,8 +43800,8 @@ inline const std::string& ListResponseMessage::title() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ListResponseMessage::set_title(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- title_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.title_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ListResponseMessage.title)
 }
 inline std::string* ListResponseMessage::mutable_title() {
@@ -41849,49 +43810,59 @@ inline std::string* ListResponseMessage::mutable_title() {
   return _s;
 }
 inline const std::string& ListResponseMessage::_internal_title() const {
-  return title_.Get();
+  return _impl_.title_.Get();
 }
 inline void ListResponseMessage::_internal_set_title(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  title_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.title_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ListResponseMessage::_internal_mutable_title() {
-  _has_bits_[0] |= 0x00000001u;
-  return title_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.title_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ListResponseMessage::release_title() {
   // @@protoc_insertion_point(field_release:proto.ListResponseMessage.title)
   if (!_internal_has_title()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return title_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.title_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.title_.IsDefault()) {
+    _impl_.title_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ListResponseMessage::set_allocated_title(std::string* title) {
   if (title != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  title_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), title,
-      GetArenaForAllocation());
+  _impl_.title_.SetAllocated(title, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.title_.IsDefault()) {
+    _impl_.title_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ListResponseMessage.title)
 }
 
 // optional .proto.ListResponseMessage.ListResponseMessageListType listType = 2;
 inline bool ListResponseMessage::_internal_has_listtype() const {
-  bool value = (_has_bits_[0] & 0x00000010u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
   return value;
 }
 inline bool ListResponseMessage::has_listtype() const {
   return _internal_has_listtype();
 }
 inline void ListResponseMessage::clear_listtype() {
-  listtype_ = 0;
-  _has_bits_[0] &= ~0x00000010u;
+  _impl_.listtype_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000010u;
 }
 inline ::proto::ListResponseMessage_ListResponseMessageListType ListResponseMessage::_internal_listtype() const {
-  return static_cast< ::proto::ListResponseMessage_ListResponseMessageListType >(listtype_);
+  return static_cast< ::proto::ListResponseMessage_ListResponseMessageListType >(_impl_.listtype_);
 }
 inline ::proto::ListResponseMessage_ListResponseMessageListType ListResponseMessage::listtype() const {
   // @@protoc_insertion_point(field_get:proto.ListResponseMessage.listType)
@@ -41899,8 +43870,8 @@ inline ::proto::ListResponseMessage_ListResponseMessageListType ListResponseMess
 }
 inline void ListResponseMessage::_internal_set_listtype(::proto::ListResponseMessage_ListResponseMessageListType value) {
   assert(::proto::ListResponseMessage_ListResponseMessageListType_IsValid(value));
-  _has_bits_[0] |= 0x00000010u;
-  listtype_ = value;
+  _impl_._has_bits_[0] |= 0x00000010u;
+  _impl_.listtype_ = value;
 }
 inline void ListResponseMessage::set_listtype(::proto::ListResponseMessage_ListResponseMessageListType value) {
   _internal_set_listtype(value);
@@ -41909,19 +43880,19 @@ inline void ListResponseMessage::set_listtype(::proto::ListResponseMessage_ListR
 
 // optional .proto.SingleSelectReply singleSelectReply = 3;
 inline bool ListResponseMessage::_internal_has_singleselectreply() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || singleselectreply_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.singleselectreply_ != nullptr);
   return value;
 }
 inline bool ListResponseMessage::has_singleselectreply() const {
   return _internal_has_singleselectreply();
 }
 inline void ListResponseMessage::clear_singleselectreply() {
-  if (singleselectreply_ != nullptr) singleselectreply_->Clear();
-  _has_bits_[0] &= ~0x00000004u;
+  if (_impl_.singleselectreply_ != nullptr) _impl_.singleselectreply_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const ::proto::SingleSelectReply& ListResponseMessage::_internal_singleselectreply() const {
-  const ::proto::SingleSelectReply* p = singleselectreply_;
+  const ::proto::SingleSelectReply* p = _impl_.singleselectreply_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::SingleSelectReply&>(
       ::proto::_SingleSelectReply_default_instance_);
 }
@@ -41932,20 +43903,20 @@ inline const ::proto::SingleSelectReply& ListResponseMessage::singleselectreply(
 inline void ListResponseMessage::unsafe_arena_set_allocated_singleselectreply(
     ::proto::SingleSelectReply* singleselectreply) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(singleselectreply_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.singleselectreply_);
   }
-  singleselectreply_ = singleselectreply;
+  _impl_.singleselectreply_ = singleselectreply;
   if (singleselectreply) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.ListResponseMessage.singleSelectReply)
 }
 inline ::proto::SingleSelectReply* ListResponseMessage::release_singleselectreply() {
-  _has_bits_[0] &= ~0x00000004u;
-  ::proto::SingleSelectReply* temp = singleselectreply_;
-  singleselectreply_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::proto::SingleSelectReply* temp = _impl_.singleselectreply_;
+  _impl_.singleselectreply_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -41959,18 +43930,18 @@ inline ::proto::SingleSelectReply* ListResponseMessage::release_singleselectrepl
 }
 inline ::proto::SingleSelectReply* ListResponseMessage::unsafe_arena_release_singleselectreply() {
   // @@protoc_insertion_point(field_release:proto.ListResponseMessage.singleSelectReply)
-  _has_bits_[0] &= ~0x00000004u;
-  ::proto::SingleSelectReply* temp = singleselectreply_;
-  singleselectreply_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::proto::SingleSelectReply* temp = _impl_.singleselectreply_;
+  _impl_.singleselectreply_ = nullptr;
   return temp;
 }
 inline ::proto::SingleSelectReply* ListResponseMessage::_internal_mutable_singleselectreply() {
-  _has_bits_[0] |= 0x00000004u;
-  if (singleselectreply_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000004u;
+  if (_impl_.singleselectreply_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::SingleSelectReply>(GetArenaForAllocation());
-    singleselectreply_ = p;
+    _impl_.singleselectreply_ = p;
   }
-  return singleselectreply_;
+  return _impl_.singleselectreply_;
 }
 inline ::proto::SingleSelectReply* ListResponseMessage::mutable_singleselectreply() {
   ::proto::SingleSelectReply* _msg = _internal_mutable_singleselectreply();
@@ -41980,38 +43951,38 @@ inline ::proto::SingleSelectReply* ListResponseMessage::mutable_singleselectrepl
 inline void ListResponseMessage::set_allocated_singleselectreply(::proto::SingleSelectReply* singleselectreply) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete singleselectreply_;
+    delete _impl_.singleselectreply_;
   }
   if (singleselectreply) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::SingleSelectReply>::GetOwningArena(singleselectreply);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(singleselectreply);
     if (message_arena != submessage_arena) {
       singleselectreply = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, singleselectreply, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
-  singleselectreply_ = singleselectreply;
+  _impl_.singleselectreply_ = singleselectreply;
   // @@protoc_insertion_point(field_set_allocated:proto.ListResponseMessage.singleSelectReply)
 }
 
 // optional .proto.ContextInfo contextInfo = 4;
 inline bool ListResponseMessage::_internal_has_contextinfo() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
-  PROTOBUF_ASSUME(!value || contextinfo_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.contextinfo_ != nullptr);
   return value;
 }
 inline bool ListResponseMessage::has_contextinfo() const {
   return _internal_has_contextinfo();
 }
 inline void ListResponseMessage::clear_contextinfo() {
-  if (contextinfo_ != nullptr) contextinfo_->Clear();
-  _has_bits_[0] &= ~0x00000008u;
+  if (_impl_.contextinfo_ != nullptr) _impl_.contextinfo_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline const ::proto::ContextInfo& ListResponseMessage::_internal_contextinfo() const {
-  const ::proto::ContextInfo* p = contextinfo_;
+  const ::proto::ContextInfo* p = _impl_.contextinfo_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ContextInfo&>(
       ::proto::_ContextInfo_default_instance_);
 }
@@ -42022,20 +43993,20 @@ inline const ::proto::ContextInfo& ListResponseMessage::contextinfo() const {
 inline void ListResponseMessage::unsafe_arena_set_allocated_contextinfo(
     ::proto::ContextInfo* contextinfo) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(contextinfo_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.contextinfo_);
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   if (contextinfo) {
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.ListResponseMessage.contextInfo)
 }
 inline ::proto::ContextInfo* ListResponseMessage::release_contextinfo() {
-  _has_bits_[0] &= ~0x00000008u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -42049,18 +44020,18 @@ inline ::proto::ContextInfo* ListResponseMessage::release_contextinfo() {
 }
 inline ::proto::ContextInfo* ListResponseMessage::unsafe_arena_release_contextinfo() {
   // @@protoc_insertion_point(field_release:proto.ListResponseMessage.contextInfo)
-  _has_bits_[0] &= ~0x00000008u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
   return temp;
 }
 inline ::proto::ContextInfo* ListResponseMessage::_internal_mutable_contextinfo() {
-  _has_bits_[0] |= 0x00000008u;
-  if (contextinfo_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000008u;
+  if (_impl_.contextinfo_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ContextInfo>(GetArenaForAllocation());
-    contextinfo_ = p;
+    _impl_.contextinfo_ = p;
   }
-  return contextinfo_;
+  return _impl_.contextinfo_;
 }
 inline ::proto::ContextInfo* ListResponseMessage::mutable_contextinfo() {
   ::proto::ContextInfo* _msg = _internal_mutable_contextinfo();
@@ -42070,34 +44041,34 @@ inline ::proto::ContextInfo* ListResponseMessage::mutable_contextinfo() {
 inline void ListResponseMessage::set_allocated_contextinfo(::proto::ContextInfo* contextinfo) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete contextinfo_;
+    delete _impl_.contextinfo_;
   }
   if (contextinfo) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ContextInfo>::GetOwningArena(contextinfo);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(contextinfo);
     if (message_arena != submessage_arena) {
       contextinfo = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, contextinfo, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   // @@protoc_insertion_point(field_set_allocated:proto.ListResponseMessage.contextInfo)
 }
 
 // optional string description = 5;
 inline bool ListResponseMessage::_internal_has_description() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool ListResponseMessage::has_description() const {
   return _internal_has_description();
 }
 inline void ListResponseMessage::clear_description() {
-  description_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.description_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& ListResponseMessage::description() const {
   // @@protoc_insertion_point(field_get:proto.ListResponseMessage.description)
@@ -42106,8 +44077,8 @@ inline const std::string& ListResponseMessage::description() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ListResponseMessage::set_description(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- description_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.description_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ListResponseMessage.description)
 }
 inline std::string* ListResponseMessage::mutable_description() {
@@ -42116,32 +44087,42 @@ inline std::string* ListResponseMessage::mutable_description() {
   return _s;
 }
 inline const std::string& ListResponseMessage::_internal_description() const {
-  return description_.Get();
+  return _impl_.description_.Get();
 }
 inline void ListResponseMessage::_internal_set_description(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  description_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.description_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ListResponseMessage::_internal_mutable_description() {
-  _has_bits_[0] |= 0x00000002u;
-  return description_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.description_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ListResponseMessage::release_description() {
   // @@protoc_insertion_point(field_release:proto.ListResponseMessage.description)
   if (!_internal_has_description()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return description_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.description_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.description_.IsDefault()) {
+    _impl_.description_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ListResponseMessage::set_allocated_description(std::string* description) {
   if (description != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  description_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), description,
-      GetArenaForAllocation());
+  _impl_.description_.SetAllocated(description, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.description_.IsDefault()) {
+    _impl_.description_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ListResponseMessage.description)
 }
 
@@ -42151,15 +44132,15 @@ inline void ListResponseMessage::set_allocated_description(std::string* descript
 
 // optional string groupJid = 1;
 inline bool GroupInviteMessage::_internal_has_groupjid() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool GroupInviteMessage::has_groupjid() const {
   return _internal_has_groupjid();
 }
 inline void GroupInviteMessage::clear_groupjid() {
-  groupjid_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.groupjid_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& GroupInviteMessage::groupjid() const {
   // @@protoc_insertion_point(field_get:proto.GroupInviteMessage.groupJid)
@@ -42168,8 +44149,8 @@ inline const std::string& GroupInviteMessage::groupjid() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void GroupInviteMessage::set_groupjid(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- groupjid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.groupjid_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.GroupInviteMessage.groupJid)
 }
 inline std::string* GroupInviteMessage::mutable_groupjid() {
@@ -42178,46 +44159,56 @@ inline std::string* GroupInviteMessage::mutable_groupjid() {
   return _s;
 }
 inline const std::string& GroupInviteMessage::_internal_groupjid() const {
-  return groupjid_.Get();
+  return _impl_.groupjid_.Get();
 }
 inline void GroupInviteMessage::_internal_set_groupjid(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  groupjid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.groupjid_.Set(value, GetArenaForAllocation());
 }
 inline std::string* GroupInviteMessage::_internal_mutable_groupjid() {
-  _has_bits_[0] |= 0x00000001u;
-  return groupjid_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.groupjid_.Mutable(GetArenaForAllocation());
 }
 inline std::string* GroupInviteMessage::release_groupjid() {
   // @@protoc_insertion_point(field_release:proto.GroupInviteMessage.groupJid)
   if (!_internal_has_groupjid()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return groupjid_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.groupjid_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.groupjid_.IsDefault()) {
+    _impl_.groupjid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void GroupInviteMessage::set_allocated_groupjid(std::string* groupjid) {
   if (groupjid != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  groupjid_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), groupjid,
-      GetArenaForAllocation());
+  _impl_.groupjid_.SetAllocated(groupjid, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.groupjid_.IsDefault()) {
+    _impl_.groupjid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.GroupInviteMessage.groupJid)
 }
 
 // optional string inviteCode = 2;
 inline bool GroupInviteMessage::_internal_has_invitecode() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool GroupInviteMessage::has_invitecode() const {
   return _internal_has_invitecode();
 }
 inline void GroupInviteMessage::clear_invitecode() {
-  invitecode_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.invitecode_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& GroupInviteMessage::invitecode() const {
   // @@protoc_insertion_point(field_get:proto.GroupInviteMessage.inviteCode)
@@ -42226,8 +44217,8 @@ inline const std::string& GroupInviteMessage::invitecode() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void GroupInviteMessage::set_invitecode(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- invitecode_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.invitecode_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.GroupInviteMessage.inviteCode)
 }
 inline std::string* GroupInviteMessage::mutable_invitecode() {
@@ -42236,74 +44227,84 @@ inline std::string* GroupInviteMessage::mutable_invitecode() {
   return _s;
 }
 inline const std::string& GroupInviteMessage::_internal_invitecode() const {
-  return invitecode_.Get();
+  return _impl_.invitecode_.Get();
 }
 inline void GroupInviteMessage::_internal_set_invitecode(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  invitecode_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.invitecode_.Set(value, GetArenaForAllocation());
 }
 inline std::string* GroupInviteMessage::_internal_mutable_invitecode() {
-  _has_bits_[0] |= 0x00000002u;
-  return invitecode_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.invitecode_.Mutable(GetArenaForAllocation());
 }
 inline std::string* GroupInviteMessage::release_invitecode() {
   // @@protoc_insertion_point(field_release:proto.GroupInviteMessage.inviteCode)
   if (!_internal_has_invitecode()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return invitecode_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.invitecode_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.invitecode_.IsDefault()) {
+    _impl_.invitecode_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void GroupInviteMessage::set_allocated_invitecode(std::string* invitecode) {
   if (invitecode != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  invitecode_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), invitecode,
-      GetArenaForAllocation());
+  _impl_.invitecode_.SetAllocated(invitecode, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.invitecode_.IsDefault()) {
+    _impl_.invitecode_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.GroupInviteMessage.inviteCode)
 }
 
 // optional int64 inviteExpiration = 3;
 inline bool GroupInviteMessage::_internal_has_inviteexpiration() const {
-  bool value = (_has_bits_[0] & 0x00000040u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
   return value;
 }
 inline bool GroupInviteMessage::has_inviteexpiration() const {
   return _internal_has_inviteexpiration();
 }
 inline void GroupInviteMessage::clear_inviteexpiration() {
-  inviteexpiration_ = int64_t{0};
-  _has_bits_[0] &= ~0x00000040u;
+  _impl_.inviteexpiration_ = int64_t{0};
+  _impl_._has_bits_[0] &= ~0x00000040u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 GroupInviteMessage::_internal_inviteexpiration() const {
-  return inviteexpiration_;
+inline int64_t GroupInviteMessage::_internal_inviteexpiration() const {
+  return _impl_.inviteexpiration_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 GroupInviteMessage::inviteexpiration() const {
+inline int64_t GroupInviteMessage::inviteexpiration() const {
   // @@protoc_insertion_point(field_get:proto.GroupInviteMessage.inviteExpiration)
   return _internal_inviteexpiration();
 }
-inline void GroupInviteMessage::_internal_set_inviteexpiration(::PROTOBUF_NAMESPACE_ID::int64 value) {
-  _has_bits_[0] |= 0x00000040u;
-  inviteexpiration_ = value;
+inline void GroupInviteMessage::_internal_set_inviteexpiration(int64_t value) {
+  _impl_._has_bits_[0] |= 0x00000040u;
+  _impl_.inviteexpiration_ = value;
 }
-inline void GroupInviteMessage::set_inviteexpiration(::PROTOBUF_NAMESPACE_ID::int64 value) {
+inline void GroupInviteMessage::set_inviteexpiration(int64_t value) {
   _internal_set_inviteexpiration(value);
   // @@protoc_insertion_point(field_set:proto.GroupInviteMessage.inviteExpiration)
 }
 
 // optional string groupName = 4;
 inline bool GroupInviteMessage::_internal_has_groupname() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool GroupInviteMessage::has_groupname() const {
   return _internal_has_groupname();
 }
 inline void GroupInviteMessage::clear_groupname() {
-  groupname_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.groupname_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const std::string& GroupInviteMessage::groupname() const {
   // @@protoc_insertion_point(field_get:proto.GroupInviteMessage.groupName)
@@ -42312,8 +44313,8 @@ inline const std::string& GroupInviteMessage::groupname() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void GroupInviteMessage::set_groupname(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000004u;
- groupname_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000004u;
+ _impl_.groupname_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.GroupInviteMessage.groupName)
 }
 inline std::string* GroupInviteMessage::mutable_groupname() {
@@ -42322,46 +44323,56 @@ inline std::string* GroupInviteMessage::mutable_groupname() {
   return _s;
 }
 inline const std::string& GroupInviteMessage::_internal_groupname() const {
-  return groupname_.Get();
+  return _impl_.groupname_.Get();
 }
 inline void GroupInviteMessage::_internal_set_groupname(const std::string& value) {
-  _has_bits_[0] |= 0x00000004u;
-  groupname_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.groupname_.Set(value, GetArenaForAllocation());
 }
 inline std::string* GroupInviteMessage::_internal_mutable_groupname() {
-  _has_bits_[0] |= 0x00000004u;
-  return groupname_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  return _impl_.groupname_.Mutable(GetArenaForAllocation());
 }
 inline std::string* GroupInviteMessage::release_groupname() {
   // @@protoc_insertion_point(field_release:proto.GroupInviteMessage.groupName)
   if (!_internal_has_groupname()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000004u;
-  return groupname_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  auto* p = _impl_.groupname_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.groupname_.IsDefault()) {
+    _impl_.groupname_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void GroupInviteMessage::set_allocated_groupname(std::string* groupname) {
   if (groupname != nullptr) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
+  }
+  _impl_.groupname_.SetAllocated(groupname, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.groupname_.IsDefault()) {
+    _impl_.groupname_.Set("", GetArenaForAllocation());
   }
-  groupname_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), groupname,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.GroupInviteMessage.groupName)
 }
 
 // optional bytes jpegThumbnail = 5;
 inline bool GroupInviteMessage::_internal_has_jpegthumbnail() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool GroupInviteMessage::has_jpegthumbnail() const {
   return _internal_has_jpegthumbnail();
 }
 inline void GroupInviteMessage::clear_jpegthumbnail() {
-  jpegthumbnail_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.jpegthumbnail_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline const std::string& GroupInviteMessage::jpegthumbnail() const {
   // @@protoc_insertion_point(field_get:proto.GroupInviteMessage.jpegThumbnail)
@@ -42370,8 +44381,8 @@ inline const std::string& GroupInviteMessage::jpegthumbnail() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void GroupInviteMessage::set_jpegthumbnail(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000008u;
- jpegthumbnail_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000008u;
+ _impl_.jpegthumbnail_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.GroupInviteMessage.jpegThumbnail)
 }
 inline std::string* GroupInviteMessage::mutable_jpegthumbnail() {
@@ -42380,46 +44391,56 @@ inline std::string* GroupInviteMessage::mutable_jpegthumbnail() {
   return _s;
 }
 inline const std::string& GroupInviteMessage::_internal_jpegthumbnail() const {
-  return jpegthumbnail_.Get();
+  return _impl_.jpegthumbnail_.Get();
 }
 inline void GroupInviteMessage::_internal_set_jpegthumbnail(const std::string& value) {
-  _has_bits_[0] |= 0x00000008u;
-  jpegthumbnail_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.jpegthumbnail_.Set(value, GetArenaForAllocation());
 }
 inline std::string* GroupInviteMessage::_internal_mutable_jpegthumbnail() {
-  _has_bits_[0] |= 0x00000008u;
-  return jpegthumbnail_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  return _impl_.jpegthumbnail_.Mutable(GetArenaForAllocation());
 }
 inline std::string* GroupInviteMessage::release_jpegthumbnail() {
   // @@protoc_insertion_point(field_release:proto.GroupInviteMessage.jpegThumbnail)
   if (!_internal_has_jpegthumbnail()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000008u;
-  return jpegthumbnail_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  auto* p = _impl_.jpegthumbnail_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.jpegthumbnail_.IsDefault()) {
+    _impl_.jpegthumbnail_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void GroupInviteMessage::set_allocated_jpegthumbnail(std::string* jpegthumbnail) {
   if (jpegthumbnail != nullptr) {
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
+  }
+  _impl_.jpegthumbnail_.SetAllocated(jpegthumbnail, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.jpegthumbnail_.IsDefault()) {
+    _impl_.jpegthumbnail_.Set("", GetArenaForAllocation());
   }
-  jpegthumbnail_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), jpegthumbnail,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.GroupInviteMessage.jpegThumbnail)
 }
 
 // optional string caption = 6;
 inline bool GroupInviteMessage::_internal_has_caption() const {
-  bool value = (_has_bits_[0] & 0x00000010u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
   return value;
 }
 inline bool GroupInviteMessage::has_caption() const {
   return _internal_has_caption();
 }
 inline void GroupInviteMessage::clear_caption() {
-  caption_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000010u;
+  _impl_.caption_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000010u;
 }
 inline const std::string& GroupInviteMessage::caption() const {
   // @@protoc_insertion_point(field_get:proto.GroupInviteMessage.caption)
@@ -42428,8 +44449,8 @@ inline const std::string& GroupInviteMessage::caption() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void GroupInviteMessage::set_caption(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000010u;
- caption_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000010u;
+ _impl_.caption_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.GroupInviteMessage.caption)
 }
 inline std::string* GroupInviteMessage::mutable_caption() {
@@ -42438,50 +44459,60 @@ inline std::string* GroupInviteMessage::mutable_caption() {
   return _s;
 }
 inline const std::string& GroupInviteMessage::_internal_caption() const {
-  return caption_.Get();
+  return _impl_.caption_.Get();
 }
 inline void GroupInviteMessage::_internal_set_caption(const std::string& value) {
-  _has_bits_[0] |= 0x00000010u;
-  caption_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  _impl_.caption_.Set(value, GetArenaForAllocation());
 }
 inline std::string* GroupInviteMessage::_internal_mutable_caption() {
-  _has_bits_[0] |= 0x00000010u;
-  return caption_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000010u;
+  return _impl_.caption_.Mutable(GetArenaForAllocation());
 }
 inline std::string* GroupInviteMessage::release_caption() {
   // @@protoc_insertion_point(field_release:proto.GroupInviteMessage.caption)
   if (!_internal_has_caption()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000010u;
-  return caption_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000010u;
+  auto* p = _impl_.caption_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.caption_.IsDefault()) {
+    _impl_.caption_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void GroupInviteMessage::set_allocated_caption(std::string* caption) {
   if (caption != nullptr) {
-    _has_bits_[0] |= 0x00000010u;
+    _impl_._has_bits_[0] |= 0x00000010u;
   } else {
-    _has_bits_[0] &= ~0x00000010u;
+    _impl_._has_bits_[0] &= ~0x00000010u;
+  }
+  _impl_.caption_.SetAllocated(caption, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.caption_.IsDefault()) {
+    _impl_.caption_.Set("", GetArenaForAllocation());
   }
-  caption_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), caption,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.GroupInviteMessage.caption)
 }
 
 // optional .proto.ContextInfo contextInfo = 7;
 inline bool GroupInviteMessage::_internal_has_contextinfo() const {
-  bool value = (_has_bits_[0] & 0x00000020u) != 0;
-  PROTOBUF_ASSUME(!value || contextinfo_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.contextinfo_ != nullptr);
   return value;
 }
 inline bool GroupInviteMessage::has_contextinfo() const {
   return _internal_has_contextinfo();
 }
 inline void GroupInviteMessage::clear_contextinfo() {
-  if (contextinfo_ != nullptr) contextinfo_->Clear();
-  _has_bits_[0] &= ~0x00000020u;
+  if (_impl_.contextinfo_ != nullptr) _impl_.contextinfo_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000020u;
 }
 inline const ::proto::ContextInfo& GroupInviteMessage::_internal_contextinfo() const {
-  const ::proto::ContextInfo* p = contextinfo_;
+  const ::proto::ContextInfo* p = _impl_.contextinfo_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ContextInfo&>(
       ::proto::_ContextInfo_default_instance_);
 }
@@ -42492,20 +44523,20 @@ inline const ::proto::ContextInfo& GroupInviteMessage::contextinfo() const {
 inline void GroupInviteMessage::unsafe_arena_set_allocated_contextinfo(
     ::proto::ContextInfo* contextinfo) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(contextinfo_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.contextinfo_);
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   if (contextinfo) {
-    _has_bits_[0] |= 0x00000020u;
+    _impl_._has_bits_[0] |= 0x00000020u;
   } else {
-    _has_bits_[0] &= ~0x00000020u;
+    _impl_._has_bits_[0] &= ~0x00000020u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.GroupInviteMessage.contextInfo)
 }
 inline ::proto::ContextInfo* GroupInviteMessage::release_contextinfo() {
-  _has_bits_[0] &= ~0x00000020u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000020u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -42519,18 +44550,18 @@ inline ::proto::ContextInfo* GroupInviteMessage::release_contextinfo() {
 }
 inline ::proto::ContextInfo* GroupInviteMessage::unsafe_arena_release_contextinfo() {
   // @@protoc_insertion_point(field_release:proto.GroupInviteMessage.contextInfo)
-  _has_bits_[0] &= ~0x00000020u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000020u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
   return temp;
 }
 inline ::proto::ContextInfo* GroupInviteMessage::_internal_mutable_contextinfo() {
-  _has_bits_[0] |= 0x00000020u;
-  if (contextinfo_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000020u;
+  if (_impl_.contextinfo_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ContextInfo>(GetArenaForAllocation());
-    contextinfo_ = p;
+    _impl_.contextinfo_ = p;
   }
-  return contextinfo_;
+  return _impl_.contextinfo_;
 }
 inline ::proto::ContextInfo* GroupInviteMessage::mutable_contextinfo() {
   ::proto::ContextInfo* _msg = _internal_mutable_contextinfo();
@@ -42540,20 +44571,20 @@ inline ::proto::ContextInfo* GroupInviteMessage::mutable_contextinfo() {
 inline void GroupInviteMessage::set_allocated_contextinfo(::proto::ContextInfo* contextinfo) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete contextinfo_;
+    delete _impl_.contextinfo_;
   }
   if (contextinfo) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ContextInfo>::GetOwningArena(contextinfo);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(contextinfo);
     if (message_arena != submessage_arena) {
       contextinfo = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, contextinfo, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000020u;
+    _impl_._has_bits_[0] |= 0x00000020u;
   } else {
-    _has_bits_[0] &= ~0x00000020u;
+    _impl_._has_bits_[0] &= ~0x00000020u;
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   // @@protoc_insertion_point(field_set_allocated:proto.GroupInviteMessage.contextInfo)
 }
 
@@ -42563,15 +44594,15 @@ inline void GroupInviteMessage::set_allocated_contextinfo(::proto::ContextInfo*
 
 // optional string chatJid = 1;
 inline bool EphemeralSetting::_internal_has_chatjid() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool EphemeralSetting::has_chatjid() const {
   return _internal_has_chatjid();
 }
 inline void EphemeralSetting::clear_chatjid() {
-  chatjid_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.chatjid_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& EphemeralSetting::chatjid() const {
   // @@protoc_insertion_point(field_get:proto.EphemeralSetting.chatJid)
@@ -42580,8 +44611,8 @@ inline const std::string& EphemeralSetting::chatjid() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void EphemeralSetting::set_chatjid(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- chatjid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.chatjid_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.EphemeralSetting.chatJid)
 }
 inline std::string* EphemeralSetting::mutable_chatjid() {
@@ -42590,87 +44621,97 @@ inline std::string* EphemeralSetting::mutable_chatjid() {
   return _s;
 }
 inline const std::string& EphemeralSetting::_internal_chatjid() const {
-  return chatjid_.Get();
+  return _impl_.chatjid_.Get();
 }
 inline void EphemeralSetting::_internal_set_chatjid(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  chatjid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.chatjid_.Set(value, GetArenaForAllocation());
 }
 inline std::string* EphemeralSetting::_internal_mutable_chatjid() {
-  _has_bits_[0] |= 0x00000001u;
-  return chatjid_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.chatjid_.Mutable(GetArenaForAllocation());
 }
 inline std::string* EphemeralSetting::release_chatjid() {
   // @@protoc_insertion_point(field_release:proto.EphemeralSetting.chatJid)
   if (!_internal_has_chatjid()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return chatjid_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.chatjid_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.chatjid_.IsDefault()) {
+    _impl_.chatjid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void EphemeralSetting::set_allocated_chatjid(std::string* chatjid) {
   if (chatjid != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
+  }
+  _impl_.chatjid_.SetAllocated(chatjid, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.chatjid_.IsDefault()) {
+    _impl_.chatjid_.Set("", GetArenaForAllocation());
   }
-  chatjid_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), chatjid,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.EphemeralSetting.chatJid)
 }
 
 // optional uint32 ephemeralExpiration = 2;
 inline bool EphemeralSetting::_internal_has_ephemeralexpiration() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool EphemeralSetting::has_ephemeralexpiration() const {
   return _internal_has_ephemeralexpiration();
 }
 inline void EphemeralSetting::clear_ephemeralexpiration() {
-  ephemeralexpiration_ = 0u;
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.ephemeralexpiration_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 EphemeralSetting::_internal_ephemeralexpiration() const {
-  return ephemeralexpiration_;
+inline uint32_t EphemeralSetting::_internal_ephemeralexpiration() const {
+  return _impl_.ephemeralexpiration_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 EphemeralSetting::ephemeralexpiration() const {
+inline uint32_t EphemeralSetting::ephemeralexpiration() const {
   // @@protoc_insertion_point(field_get:proto.EphemeralSetting.ephemeralExpiration)
   return _internal_ephemeralexpiration();
 }
-inline void EphemeralSetting::_internal_set_ephemeralexpiration(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000004u;
-  ephemeralexpiration_ = value;
+inline void EphemeralSetting::_internal_set_ephemeralexpiration(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.ephemeralexpiration_ = value;
 }
-inline void EphemeralSetting::set_ephemeralexpiration(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void EphemeralSetting::set_ephemeralexpiration(uint32_t value) {
   _internal_set_ephemeralexpiration(value);
   // @@protoc_insertion_point(field_set:proto.EphemeralSetting.ephemeralExpiration)
 }
 
 // optional int64 ephemeralSettingTimestamp = 3;
 inline bool EphemeralSetting::_internal_has_ephemeralsettingtimestamp() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool EphemeralSetting::has_ephemeralsettingtimestamp() const {
   return _internal_has_ephemeralsettingtimestamp();
 }
 inline void EphemeralSetting::clear_ephemeralsettingtimestamp() {
-  ephemeralsettingtimestamp_ = int64_t{0};
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.ephemeralsettingtimestamp_ = int64_t{0};
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 EphemeralSetting::_internal_ephemeralsettingtimestamp() const {
-  return ephemeralsettingtimestamp_;
+inline int64_t EphemeralSetting::_internal_ephemeralsettingtimestamp() const {
+  return _impl_.ephemeralsettingtimestamp_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::int64 EphemeralSetting::ephemeralsettingtimestamp() const {
+inline int64_t EphemeralSetting::ephemeralsettingtimestamp() const {
   // @@protoc_insertion_point(field_get:proto.EphemeralSetting.ephemeralSettingTimestamp)
   return _internal_ephemeralsettingtimestamp();
 }
-inline void EphemeralSetting::_internal_set_ephemeralsettingtimestamp(::PROTOBUF_NAMESPACE_ID::int64 value) {
-  _has_bits_[0] |= 0x00000002u;
-  ephemeralsettingtimestamp_ = value;
+inline void EphemeralSetting::_internal_set_ephemeralsettingtimestamp(int64_t value) {
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.ephemeralsettingtimestamp_ = value;
 }
-inline void EphemeralSetting::set_ephemeralsettingtimestamp(::PROTOBUF_NAMESPACE_ID::int64 value) {
+inline void EphemeralSetting::set_ephemeralsettingtimestamp(int64_t value) {
   _internal_set_ephemeralsettingtimestamp(value);
   // @@protoc_insertion_point(field_set:proto.EphemeralSetting.ephemeralSettingTimestamp)
 }
@@ -42681,15 +44722,15 @@ inline void EphemeralSetting::set_ephemeralsettingtimestamp(::PROTOBUF_NAMESPACE
 
 // optional string destinationJid = 1;
 inline bool DeviceSentMessage::_internal_has_destinationjid() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool DeviceSentMessage::has_destinationjid() const {
   return _internal_has_destinationjid();
 }
 inline void DeviceSentMessage::clear_destinationjid() {
-  destinationjid_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.destinationjid_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& DeviceSentMessage::destinationjid() const {
   // @@protoc_insertion_point(field_get:proto.DeviceSentMessage.destinationJid)
@@ -42698,8 +44739,8 @@ inline const std::string& DeviceSentMessage::destinationjid() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void DeviceSentMessage::set_destinationjid(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- destinationjid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.destinationjid_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.DeviceSentMessage.destinationJid)
 }
 inline std::string* DeviceSentMessage::mutable_destinationjid() {
@@ -42708,50 +44749,60 @@ inline std::string* DeviceSentMessage::mutable_destinationjid() {
   return _s;
 }
 inline const std::string& DeviceSentMessage::_internal_destinationjid() const {
-  return destinationjid_.Get();
+  return _impl_.destinationjid_.Get();
 }
 inline void DeviceSentMessage::_internal_set_destinationjid(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  destinationjid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.destinationjid_.Set(value, GetArenaForAllocation());
 }
 inline std::string* DeviceSentMessage::_internal_mutable_destinationjid() {
-  _has_bits_[0] |= 0x00000001u;
-  return destinationjid_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.destinationjid_.Mutable(GetArenaForAllocation());
 }
 inline std::string* DeviceSentMessage::release_destinationjid() {
   // @@protoc_insertion_point(field_release:proto.DeviceSentMessage.destinationJid)
   if (!_internal_has_destinationjid()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return destinationjid_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.destinationjid_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.destinationjid_.IsDefault()) {
+    _impl_.destinationjid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void DeviceSentMessage::set_allocated_destinationjid(std::string* destinationjid) {
   if (destinationjid != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
+  }
+  _impl_.destinationjid_.SetAllocated(destinationjid, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.destinationjid_.IsDefault()) {
+    _impl_.destinationjid_.Set("", GetArenaForAllocation());
   }
-  destinationjid_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), destinationjid,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.DeviceSentMessage.destinationJid)
 }
 
 // optional .proto.Message message = 2;
 inline bool DeviceSentMessage::_internal_has_message() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || message_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.message_ != nullptr);
   return value;
 }
 inline bool DeviceSentMessage::has_message() const {
   return _internal_has_message();
 }
 inline void DeviceSentMessage::clear_message() {
-  if (message_ != nullptr) message_->Clear();
-  _has_bits_[0] &= ~0x00000004u;
+  if (_impl_.message_ != nullptr) _impl_.message_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const ::proto::Message& DeviceSentMessage::_internal_message() const {
-  const ::proto::Message* p = message_;
+  const ::proto::Message* p = _impl_.message_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::Message&>(
       ::proto::_Message_default_instance_);
 }
@@ -42762,20 +44813,20 @@ inline const ::proto::Message& DeviceSentMessage::message() const {
 inline void DeviceSentMessage::unsafe_arena_set_allocated_message(
     ::proto::Message* message) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(message_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.message_);
   }
-  message_ = message;
+  _impl_.message_ = message;
   if (message) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.DeviceSentMessage.message)
 }
 inline ::proto::Message* DeviceSentMessage::release_message() {
-  _has_bits_[0] &= ~0x00000004u;
-  ::proto::Message* temp = message_;
-  message_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::proto::Message* temp = _impl_.message_;
+  _impl_.message_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -42789,18 +44840,18 @@ inline ::proto::Message* DeviceSentMessage::release_message() {
 }
 inline ::proto::Message* DeviceSentMessage::unsafe_arena_release_message() {
   // @@protoc_insertion_point(field_release:proto.DeviceSentMessage.message)
-  _has_bits_[0] &= ~0x00000004u;
-  ::proto::Message* temp = message_;
-  message_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::proto::Message* temp = _impl_.message_;
+  _impl_.message_ = nullptr;
   return temp;
 }
 inline ::proto::Message* DeviceSentMessage::_internal_mutable_message() {
-  _has_bits_[0] |= 0x00000004u;
-  if (message_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000004u;
+  if (_impl_.message_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::Message>(GetArenaForAllocation());
-    message_ = p;
+    _impl_.message_ = p;
   }
-  return message_;
+  return _impl_.message_;
 }
 inline ::proto::Message* DeviceSentMessage::mutable_message() {
   ::proto::Message* _msg = _internal_mutable_message();
@@ -42810,34 +44861,34 @@ inline ::proto::Message* DeviceSentMessage::mutable_message() {
 inline void DeviceSentMessage::set_allocated_message(::proto::Message* message) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete message_;
+    delete _impl_.message_;
   }
   if (message) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::Message>::GetOwningArena(message);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(message);
     if (message_arena != submessage_arena) {
       message = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, message, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
-  message_ = message;
+  _impl_.message_ = message;
   // @@protoc_insertion_point(field_set_allocated:proto.DeviceSentMessage.message)
 }
 
 // optional string phash = 3;
 inline bool DeviceSentMessage::_internal_has_phash() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool DeviceSentMessage::has_phash() const {
   return _internal_has_phash();
 }
 inline void DeviceSentMessage::clear_phash() {
-  phash_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.phash_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& DeviceSentMessage::phash() const {
   // @@protoc_insertion_point(field_get:proto.DeviceSentMessage.phash)
@@ -42846,8 +44897,8 @@ inline const std::string& DeviceSentMessage::phash() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void DeviceSentMessage::set_phash(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- phash_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.phash_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.DeviceSentMessage.phash)
 }
 inline std::string* DeviceSentMessage::mutable_phash() {
@@ -42856,63 +44907,73 @@ inline std::string* DeviceSentMessage::mutable_phash() {
   return _s;
 }
 inline const std::string& DeviceSentMessage::_internal_phash() const {
-  return phash_.Get();
+  return _impl_.phash_.Get();
 }
 inline void DeviceSentMessage::_internal_set_phash(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  phash_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.phash_.Set(value, GetArenaForAllocation());
 }
 inline std::string* DeviceSentMessage::_internal_mutable_phash() {
-  _has_bits_[0] |= 0x00000002u;
-  return phash_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.phash_.Mutable(GetArenaForAllocation());
 }
 inline std::string* DeviceSentMessage::release_phash() {
   // @@protoc_insertion_point(field_release:proto.DeviceSentMessage.phash)
   if (!_internal_has_phash()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return phash_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.phash_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.phash_.IsDefault()) {
+    _impl_.phash_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void DeviceSentMessage::set_allocated_phash(std::string* phash) {
   if (phash != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
+  }
+  _impl_.phash_.SetAllocated(phash, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.phash_.IsDefault()) {
+    _impl_.phash_.Set("", GetArenaForAllocation());
   }
-  phash_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), phash,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.DeviceSentMessage.phash)
 }
 
 // repeated .proto.EphemeralSetting broadcastEphemeralSettings = 4;
 inline int DeviceSentMessage::_internal_broadcastephemeralsettings_size() const {
-  return broadcastephemeralsettings_.size();
+  return _impl_.broadcastephemeralsettings_.size();
 }
 inline int DeviceSentMessage::broadcastephemeralsettings_size() const {
   return _internal_broadcastephemeralsettings_size();
 }
 inline void DeviceSentMessage::clear_broadcastephemeralsettings() {
-  broadcastephemeralsettings_.Clear();
+  _impl_.broadcastephemeralsettings_.Clear();
 }
 inline ::proto::EphemeralSetting* DeviceSentMessage::mutable_broadcastephemeralsettings(int index) {
   // @@protoc_insertion_point(field_mutable:proto.DeviceSentMessage.broadcastEphemeralSettings)
-  return broadcastephemeralsettings_.Mutable(index);
+  return _impl_.broadcastephemeralsettings_.Mutable(index);
 }
 inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::EphemeralSetting >*
 DeviceSentMessage::mutable_broadcastephemeralsettings() {
   // @@protoc_insertion_point(field_mutable_list:proto.DeviceSentMessage.broadcastEphemeralSettings)
-  return &broadcastephemeralsettings_;
+  return &_impl_.broadcastephemeralsettings_;
 }
 inline const ::proto::EphemeralSetting& DeviceSentMessage::_internal_broadcastephemeralsettings(int index) const {
-  return broadcastephemeralsettings_.Get(index);
+  return _impl_.broadcastephemeralsettings_.Get(index);
 }
 inline const ::proto::EphemeralSetting& DeviceSentMessage::broadcastephemeralsettings(int index) const {
   // @@protoc_insertion_point(field_get:proto.DeviceSentMessage.broadcastEphemeralSettings)
   return _internal_broadcastephemeralsettings(index);
 }
 inline ::proto::EphemeralSetting* DeviceSentMessage::_internal_add_broadcastephemeralsettings() {
-  return broadcastephemeralsettings_.Add();
+  return _impl_.broadcastephemeralsettings_.Add();
 }
 inline ::proto::EphemeralSetting* DeviceSentMessage::add_broadcastephemeralsettings() {
   ::proto::EphemeralSetting* _add = _internal_add_broadcastephemeralsettings();
@@ -42922,7 +44983,7 @@ inline ::proto::EphemeralSetting* DeviceSentMessage::add_broadcastephemeralsetti
 inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::EphemeralSetting >&
 DeviceSentMessage::broadcastephemeralsettings() const {
   // @@protoc_insertion_point(field_list:proto.DeviceSentMessage.broadcastEphemeralSettings)
-  return broadcastephemeralsettings_;
+  return _impl_.broadcastephemeralsettings_;
 }
 
 // -------------------------------------------------------------------
@@ -42931,19 +44992,19 @@ DeviceSentMessage::broadcastephemeralsettings() const {
 
 // optional .proto.Message message = 1;
 inline bool FutureProofMessage::_internal_has_message() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || message_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.message_ != nullptr);
   return value;
 }
 inline bool FutureProofMessage::has_message() const {
   return _internal_has_message();
 }
 inline void FutureProofMessage::clear_message() {
-  if (message_ != nullptr) message_->Clear();
-  _has_bits_[0] &= ~0x00000001u;
+  if (_impl_.message_ != nullptr) _impl_.message_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const ::proto::Message& FutureProofMessage::_internal_message() const {
-  const ::proto::Message* p = message_;
+  const ::proto::Message* p = _impl_.message_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::Message&>(
       ::proto::_Message_default_instance_);
 }
@@ -42954,20 +45015,20 @@ inline const ::proto::Message& FutureProofMessage::message() const {
 inline void FutureProofMessage::unsafe_arena_set_allocated_message(
     ::proto::Message* message) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(message_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.message_);
   }
-  message_ = message;
+  _impl_.message_ = message;
   if (message) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.FutureProofMessage.message)
 }
 inline ::proto::Message* FutureProofMessage::release_message() {
-  _has_bits_[0] &= ~0x00000001u;
-  ::proto::Message* temp = message_;
-  message_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  ::proto::Message* temp = _impl_.message_;
+  _impl_.message_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -42981,18 +45042,18 @@ inline ::proto::Message* FutureProofMessage::release_message() {
 }
 inline ::proto::Message* FutureProofMessage::unsafe_arena_release_message() {
   // @@protoc_insertion_point(field_release:proto.FutureProofMessage.message)
-  _has_bits_[0] &= ~0x00000001u;
-  ::proto::Message* temp = message_;
-  message_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  ::proto::Message* temp = _impl_.message_;
+  _impl_.message_ = nullptr;
   return temp;
 }
 inline ::proto::Message* FutureProofMessage::_internal_mutable_message() {
-  _has_bits_[0] |= 0x00000001u;
-  if (message_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000001u;
+  if (_impl_.message_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::Message>(GetArenaForAllocation());
-    message_ = p;
+    _impl_.message_ = p;
   }
-  return message_;
+  return _impl_.message_;
 }
 inline ::proto::Message* FutureProofMessage::mutable_message() {
   ::proto::Message* _msg = _internal_mutable_message();
@@ -43002,20 +45063,20 @@ inline ::proto::Message* FutureProofMessage::mutable_message() {
 inline void FutureProofMessage::set_allocated_message(::proto::Message* message) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete message_;
+    delete _impl_.message_;
   }
   if (message) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::Message>::GetOwningArena(message);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(message);
     if (message_arena != submessage_arena) {
       message = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, message, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  message_ = message;
+  _impl_.message_ = message;
   // @@protoc_insertion_point(field_set_allocated:proto.FutureProofMessage.message)
 }
 
@@ -43025,15 +45086,15 @@ inline void FutureProofMessage::set_allocated_message(::proto::Message* message)
 
 // optional string displayText = 1;
 inline bool ButtonText::_internal_has_displaytext() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool ButtonText::has_displaytext() const {
   return _internal_has_displaytext();
 }
 inline void ButtonText::clear_displaytext() {
-  displaytext_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.displaytext_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& ButtonText::displaytext() const {
   // @@protoc_insertion_point(field_get:proto.ButtonText.displayText)
@@ -43042,8 +45103,8 @@ inline const std::string& ButtonText::displaytext() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ButtonText::set_displaytext(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- displaytext_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.displaytext_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ButtonText.displayText)
 }
 inline std::string* ButtonText::mutable_displaytext() {
@@ -43052,32 +45113,42 @@ inline std::string* ButtonText::mutable_displaytext() {
   return _s;
 }
 inline const std::string& ButtonText::_internal_displaytext() const {
-  return displaytext_.Get();
+  return _impl_.displaytext_.Get();
 }
 inline void ButtonText::_internal_set_displaytext(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  displaytext_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.displaytext_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ButtonText::_internal_mutable_displaytext() {
-  _has_bits_[0] |= 0x00000001u;
-  return displaytext_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.displaytext_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ButtonText::release_displaytext() {
   // @@protoc_insertion_point(field_release:proto.ButtonText.displayText)
   if (!_internal_has_displaytext()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return displaytext_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.displaytext_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.displaytext_.IsDefault()) {
+    _impl_.displaytext_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ButtonText::set_allocated_displaytext(std::string* displaytext) {
   if (displaytext != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
+  }
+  _impl_.displaytext_.SetAllocated(displaytext, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.displaytext_.IsDefault()) {
+    _impl_.displaytext_.Set("", GetArenaForAllocation());
   }
-  displaytext_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), displaytext,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ButtonText.displayText)
 }
 
@@ -43087,15 +45158,15 @@ inline void ButtonText::set_allocated_displaytext(std::string* displaytext) {
 
 // optional string buttonId = 1;
 inline bool Button::_internal_has_buttonid() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool Button::has_buttonid() const {
   return _internal_has_buttonid();
 }
 inline void Button::clear_buttonid() {
-  buttonid_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.buttonid_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& Button::buttonid() const {
   // @@protoc_insertion_point(field_get:proto.Button.buttonId)
@@ -43104,8 +45175,8 @@ inline const std::string& Button::buttonid() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void Button::set_buttonid(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- buttonid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.buttonid_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.Button.buttonId)
 }
 inline std::string* Button::mutable_buttonid() {
@@ -43114,50 +45185,60 @@ inline std::string* Button::mutable_buttonid() {
   return _s;
 }
 inline const std::string& Button::_internal_buttonid() const {
-  return buttonid_.Get();
+  return _impl_.buttonid_.Get();
 }
 inline void Button::_internal_set_buttonid(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  buttonid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.buttonid_.Set(value, GetArenaForAllocation());
 }
 inline std::string* Button::_internal_mutable_buttonid() {
-  _has_bits_[0] |= 0x00000001u;
-  return buttonid_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.buttonid_.Mutable(GetArenaForAllocation());
 }
 inline std::string* Button::release_buttonid() {
   // @@protoc_insertion_point(field_release:proto.Button.buttonId)
   if (!_internal_has_buttonid()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return buttonid_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.buttonid_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.buttonid_.IsDefault()) {
+    _impl_.buttonid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void Button::set_allocated_buttonid(std::string* buttonid) {
   if (buttonid != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
+  }
+  _impl_.buttonid_.SetAllocated(buttonid, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.buttonid_.IsDefault()) {
+    _impl_.buttonid_.Set("", GetArenaForAllocation());
   }
-  buttonid_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), buttonid,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.Button.buttonId)
 }
 
 // optional .proto.ButtonText buttonText = 2;
 inline bool Button::_internal_has_buttontext() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || buttontext_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.buttontext_ != nullptr);
   return value;
 }
 inline bool Button::has_buttontext() const {
   return _internal_has_buttontext();
 }
 inline void Button::clear_buttontext() {
-  if (buttontext_ != nullptr) buttontext_->Clear();
-  _has_bits_[0] &= ~0x00000002u;
+  if (_impl_.buttontext_ != nullptr) _impl_.buttontext_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const ::proto::ButtonText& Button::_internal_buttontext() const {
-  const ::proto::ButtonText* p = buttontext_;
+  const ::proto::ButtonText* p = _impl_.buttontext_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ButtonText&>(
       ::proto::_ButtonText_default_instance_);
 }
@@ -43168,20 +45249,20 @@ inline const ::proto::ButtonText& Button::buttontext() const {
 inline void Button::unsafe_arena_set_allocated_buttontext(
     ::proto::ButtonText* buttontext) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(buttontext_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.buttontext_);
   }
-  buttontext_ = buttontext;
+  _impl_.buttontext_ = buttontext;
   if (buttontext) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Button.buttonText)
 }
 inline ::proto::ButtonText* Button::release_buttontext() {
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::ButtonText* temp = buttontext_;
-  buttontext_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::ButtonText* temp = _impl_.buttontext_;
+  _impl_.buttontext_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -43195,18 +45276,18 @@ inline ::proto::ButtonText* Button::release_buttontext() {
 }
 inline ::proto::ButtonText* Button::unsafe_arena_release_buttontext() {
   // @@protoc_insertion_point(field_release:proto.Button.buttonText)
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::ButtonText* temp = buttontext_;
-  buttontext_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::ButtonText* temp = _impl_.buttontext_;
+  _impl_.buttontext_ = nullptr;
   return temp;
 }
 inline ::proto::ButtonText* Button::_internal_mutable_buttontext() {
-  _has_bits_[0] |= 0x00000002u;
-  if (buttontext_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000002u;
+  if (_impl_.buttontext_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ButtonText>(GetArenaForAllocation());
-    buttontext_ = p;
+    _impl_.buttontext_ = p;
   }
-  return buttontext_;
+  return _impl_.buttontext_;
 }
 inline ::proto::ButtonText* Button::mutable_buttontext() {
   ::proto::ButtonText* _msg = _internal_mutable_buttontext();
@@ -43216,37 +45297,37 @@ inline ::proto::ButtonText* Button::mutable_buttontext() {
 inline void Button::set_allocated_buttontext(::proto::ButtonText* buttontext) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete buttontext_;
+    delete _impl_.buttontext_;
   }
   if (buttontext) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ButtonText>::GetOwningArena(buttontext);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(buttontext);
     if (message_arena != submessage_arena) {
       buttontext = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, buttontext, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  buttontext_ = buttontext;
+  _impl_.buttontext_ = buttontext;
   // @@protoc_insertion_point(field_set_allocated:proto.Button.buttonText)
 }
 
 // optional .proto.Button.ButtonType type = 3;
 inline bool Button::_internal_has_type() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool Button::has_type() const {
   return _internal_has_type();
 }
 inline void Button::clear_type() {
-  type_ = 0;
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.type_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline ::proto::Button_ButtonType Button::_internal_type() const {
-  return static_cast< ::proto::Button_ButtonType >(type_);
+  return static_cast< ::proto::Button_ButtonType >(_impl_.type_);
 }
 inline ::proto::Button_ButtonType Button::type() const {
   // @@protoc_insertion_point(field_get:proto.Button.type)
@@ -43254,8 +45335,8 @@ inline ::proto::Button_ButtonType Button::type() const {
 }
 inline void Button::_internal_set_type(::proto::Button_ButtonType value) {
   assert(::proto::Button_ButtonType_IsValid(value));
-  _has_bits_[0] |= 0x00000004u;
-  type_ = value;
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.type_ = value;
 }
 inline void Button::set_type(::proto::Button_ButtonType value) {
   _internal_set_type(value);
@@ -43268,15 +45349,15 @@ inline void Button::set_type(::proto::Button_ButtonType value) {
 
 // optional string contentText = 6;
 inline bool ButtonsMessage::_internal_has_contenttext() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool ButtonsMessage::has_contenttext() const {
   return _internal_has_contenttext();
 }
 inline void ButtonsMessage::clear_contenttext() {
-  contenttext_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.contenttext_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& ButtonsMessage::contenttext() const {
   // @@protoc_insertion_point(field_get:proto.ButtonsMessage.contentText)
@@ -43285,8 +45366,8 @@ inline const std::string& ButtonsMessage::contenttext() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ButtonsMessage::set_contenttext(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- contenttext_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.contenttext_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ButtonsMessage.contentText)
 }
 inline std::string* ButtonsMessage::mutable_contenttext() {
@@ -43295,46 +45376,56 @@ inline std::string* ButtonsMessage::mutable_contenttext() {
   return _s;
 }
 inline const std::string& ButtonsMessage::_internal_contenttext() const {
-  return contenttext_.Get();
+  return _impl_.contenttext_.Get();
 }
 inline void ButtonsMessage::_internal_set_contenttext(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  contenttext_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.contenttext_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ButtonsMessage::_internal_mutable_contenttext() {
-  _has_bits_[0] |= 0x00000001u;
-  return contenttext_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.contenttext_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ButtonsMessage::release_contenttext() {
   // @@protoc_insertion_point(field_release:proto.ButtonsMessage.contentText)
   if (!_internal_has_contenttext()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return contenttext_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.contenttext_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.contenttext_.IsDefault()) {
+    _impl_.contenttext_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ButtonsMessage::set_allocated_contenttext(std::string* contenttext) {
   if (contenttext != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  contenttext_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), contenttext,
-      GetArenaForAllocation());
+  _impl_.contenttext_.SetAllocated(contenttext, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.contenttext_.IsDefault()) {
+    _impl_.contenttext_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ButtonsMessage.contentText)
 }
 
 // optional string footerText = 7;
 inline bool ButtonsMessage::_internal_has_footertext() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool ButtonsMessage::has_footertext() const {
   return _internal_has_footertext();
 }
 inline void ButtonsMessage::clear_footertext() {
-  footertext_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.footertext_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& ButtonsMessage::footertext() const {
   // @@protoc_insertion_point(field_get:proto.ButtonsMessage.footerText)
@@ -43343,8 +45434,8 @@ inline const std::string& ButtonsMessage::footertext() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ButtonsMessage::set_footertext(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- footertext_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.footertext_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ButtonsMessage.footerText)
 }
 inline std::string* ButtonsMessage::mutable_footertext() {
@@ -43353,50 +45444,60 @@ inline std::string* ButtonsMessage::mutable_footertext() {
   return _s;
 }
 inline const std::string& ButtonsMessage::_internal_footertext() const {
-  return footertext_.Get();
+  return _impl_.footertext_.Get();
 }
 inline void ButtonsMessage::_internal_set_footertext(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  footertext_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.footertext_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ButtonsMessage::_internal_mutable_footertext() {
-  _has_bits_[0] |= 0x00000002u;
-  return footertext_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.footertext_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ButtonsMessage::release_footertext() {
   // @@protoc_insertion_point(field_release:proto.ButtonsMessage.footerText)
   if (!_internal_has_footertext()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return footertext_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.footertext_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.footertext_.IsDefault()) {
+    _impl_.footertext_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ButtonsMessage::set_allocated_footertext(std::string* footertext) {
   if (footertext != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  footertext_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), footertext,
-      GetArenaForAllocation());
+  _impl_.footertext_.SetAllocated(footertext, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.footertext_.IsDefault()) {
+    _impl_.footertext_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ButtonsMessage.footerText)
 }
 
 // optional .proto.ContextInfo contextInfo = 8;
 inline bool ButtonsMessage::_internal_has_contextinfo() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || contextinfo_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.contextinfo_ != nullptr);
   return value;
 }
 inline bool ButtonsMessage::has_contextinfo() const {
   return _internal_has_contextinfo();
 }
 inline void ButtonsMessage::clear_contextinfo() {
-  if (contextinfo_ != nullptr) contextinfo_->Clear();
-  _has_bits_[0] &= ~0x00000004u;
+  if (_impl_.contextinfo_ != nullptr) _impl_.contextinfo_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const ::proto::ContextInfo& ButtonsMessage::_internal_contextinfo() const {
-  const ::proto::ContextInfo* p = contextinfo_;
+  const ::proto::ContextInfo* p = _impl_.contextinfo_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ContextInfo&>(
       ::proto::_ContextInfo_default_instance_);
 }
@@ -43407,20 +45508,20 @@ inline const ::proto::ContextInfo& ButtonsMessage::contextinfo() const {
 inline void ButtonsMessage::unsafe_arena_set_allocated_contextinfo(
     ::proto::ContextInfo* contextinfo) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(contextinfo_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.contextinfo_);
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   if (contextinfo) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.ButtonsMessage.contextInfo)
 }
 inline ::proto::ContextInfo* ButtonsMessage::release_contextinfo() {
-  _has_bits_[0] &= ~0x00000004u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -43434,18 +45535,18 @@ inline ::proto::ContextInfo* ButtonsMessage::release_contextinfo() {
 }
 inline ::proto::ContextInfo* ButtonsMessage::unsafe_arena_release_contextinfo() {
   // @@protoc_insertion_point(field_release:proto.ButtonsMessage.contextInfo)
-  _has_bits_[0] &= ~0x00000004u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
   return temp;
 }
 inline ::proto::ContextInfo* ButtonsMessage::_internal_mutable_contextinfo() {
-  _has_bits_[0] |= 0x00000004u;
-  if (contextinfo_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000004u;
+  if (_impl_.contextinfo_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ContextInfo>(GetArenaForAllocation());
-    contextinfo_ = p;
+    _impl_.contextinfo_ = p;
   }
-  return contextinfo_;
+  return _impl_.contextinfo_;
 }
 inline ::proto::ContextInfo* ButtonsMessage::mutable_contextinfo() {
   ::proto::ContextInfo* _msg = _internal_mutable_contextinfo();
@@ -43455,51 +45556,51 @@ inline ::proto::ContextInfo* ButtonsMessage::mutable_contextinfo() {
 inline void ButtonsMessage::set_allocated_contextinfo(::proto::ContextInfo* contextinfo) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete contextinfo_;
+    delete _impl_.contextinfo_;
   }
   if (contextinfo) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ContextInfo>::GetOwningArena(contextinfo);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(contextinfo);
     if (message_arena != submessage_arena) {
       contextinfo = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, contextinfo, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   // @@protoc_insertion_point(field_set_allocated:proto.ButtonsMessage.contextInfo)
 }
 
 // repeated .proto.Button buttons = 9;
 inline int ButtonsMessage::_internal_buttons_size() const {
-  return buttons_.size();
+  return _impl_.buttons_.size();
 }
 inline int ButtonsMessage::buttons_size() const {
   return _internal_buttons_size();
 }
 inline void ButtonsMessage::clear_buttons() {
-  buttons_.Clear();
+  _impl_.buttons_.Clear();
 }
 inline ::proto::Button* ButtonsMessage::mutable_buttons(int index) {
   // @@protoc_insertion_point(field_mutable:proto.ButtonsMessage.buttons)
-  return buttons_.Mutable(index);
+  return _impl_.buttons_.Mutable(index);
 }
 inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::Button >*
 ButtonsMessage::mutable_buttons() {
   // @@protoc_insertion_point(field_mutable_list:proto.ButtonsMessage.buttons)
-  return &buttons_;
+  return &_impl_.buttons_;
 }
 inline const ::proto::Button& ButtonsMessage::_internal_buttons(int index) const {
-  return buttons_.Get(index);
+  return _impl_.buttons_.Get(index);
 }
 inline const ::proto::Button& ButtonsMessage::buttons(int index) const {
   // @@protoc_insertion_point(field_get:proto.ButtonsMessage.buttons)
   return _internal_buttons(index);
 }
 inline ::proto::Button* ButtonsMessage::_internal_add_buttons() {
-  return buttons_.Add();
+  return _impl_.buttons_.Add();
 }
 inline ::proto::Button* ButtonsMessage::add_buttons() {
   ::proto::Button* _add = _internal_add_buttons();
@@ -43509,23 +45610,23 @@ inline ::proto::Button* ButtonsMessage::add_buttons() {
 inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::Button >&
 ButtonsMessage::buttons() const {
   // @@protoc_insertion_point(field_list:proto.ButtonsMessage.buttons)
-  return buttons_;
+  return _impl_.buttons_;
 }
 
 // optional .proto.ButtonsMessage.ButtonsMessageHeaderType headerType = 10;
 inline bool ButtonsMessage::_internal_has_headertype() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool ButtonsMessage::has_headertype() const {
   return _internal_has_headertype();
 }
 inline void ButtonsMessage::clear_headertype() {
-  headertype_ = 0;
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.headertype_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline ::proto::ButtonsMessage_ButtonsMessageHeaderType ButtonsMessage::_internal_headertype() const {
-  return static_cast< ::proto::ButtonsMessage_ButtonsMessageHeaderType >(headertype_);
+  return static_cast< ::proto::ButtonsMessage_ButtonsMessageHeaderType >(_impl_.headertype_);
 }
 inline ::proto::ButtonsMessage_ButtonsMessageHeaderType ButtonsMessage::headertype() const {
   // @@protoc_insertion_point(field_get:proto.ButtonsMessage.headerType)
@@ -43533,8 +45634,8 @@ inline ::proto::ButtonsMessage_ButtonsMessageHeaderType ButtonsMessage::headerty
 }
 inline void ButtonsMessage::_internal_set_headertype(::proto::ButtonsMessage_ButtonsMessageHeaderType value) {
   assert(::proto::ButtonsMessage_ButtonsMessageHeaderType_IsValid(value));
-  _has_bits_[0] |= 0x00000008u;
-  headertype_ = value;
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.headertype_ = value;
 }
 inline void ButtonsMessage::set_headertype(::proto::ButtonsMessage_ButtonsMessageHeaderType value) {
   _internal_set_headertype(value);
@@ -43549,11 +45650,11 @@ inline bool ButtonsMessage::has_text() const {
   return _internal_has_text();
 }
 inline void ButtonsMessage::set_has_text() {
-  _oneof_case_[0] = kText;
+  _impl_._oneof_case_[0] = kText;
 }
 inline void ButtonsMessage::clear_text() {
   if (_internal_has_text()) {
-    header_.text_.Destroy(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+    _impl_.header_.text_.Destroy();
     clear_has_header();
   }
 }
@@ -43566,9 +45667,9 @@ inline void ButtonsMessage::set_text(ArgT0&& arg0, ArgT... args) {
   if (!_internal_has_text()) {
     clear_header();
     set_has_text();
-    header_.text_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+    _impl_.header_.text_.InitDefault();
   }
-  header_.text_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+  _impl_.header_.text_.Set( static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ButtonsMessage.text)
 }
 inline std::string* ButtonsMessage::mutable_text() {
@@ -43578,7 +45679,7 @@ inline std::string* ButtonsMessage::mutable_text() {
 }
 inline const std::string& ButtonsMessage::_internal_text() const {
   if (_internal_has_text()) {
-    return header_.text_.Get();
+    return _impl_.header_.text_.Get();
   }
   return ::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited();
 }
@@ -43586,24 +45687,23 @@ inline void ButtonsMessage::_internal_set_text(const std::string& value) {
   if (!_internal_has_text()) {
     clear_header();
     set_has_text();
-    header_.text_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+    _impl_.header_.text_.InitDefault();
   }
-  header_.text_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_.header_.text_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ButtonsMessage::_internal_mutable_text() {
   if (!_internal_has_text()) {
     clear_header();
     set_has_text();
-    header_.text_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+    _impl_.header_.text_.InitDefault();
   }
-  return header_.text_.Mutable(
-      ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  return _impl_.header_.text_.Mutable(      GetArenaForAllocation());
 }
 inline std::string* ButtonsMessage::release_text() {
   // @@protoc_insertion_point(field_release:proto.ButtonsMessage.text)
   if (_internal_has_text()) {
     clear_has_header();
-    return header_.text_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+    return _impl_.header_.text_.Release();
   } else {
     return nullptr;
   }
@@ -43614,11 +45714,7 @@ inline void ButtonsMessage::set_allocated_text(std::string* text) {
   }
   if (text != nullptr) {
     set_has_text();
-    header_.text_.UnsafeSetDefault(text);
-    ::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaForAllocation();
-    if (arena != nullptr) {
-      arena->Own(text);
-    }
+    _impl_.header_.text_.InitAllocated(text, GetArenaForAllocation());
   }
   // @@protoc_insertion_point(field_set_allocated:proto.ButtonsMessage.text)
 }
@@ -43631,12 +45727,12 @@ inline bool ButtonsMessage::has_documentmessage() const {
   return _internal_has_documentmessage();
 }
 inline void ButtonsMessage::set_has_documentmessage() {
-  _oneof_case_[0] = kDocumentMessage;
+  _impl_._oneof_case_[0] = kDocumentMessage;
 }
 inline void ButtonsMessage::clear_documentmessage() {
   if (_internal_has_documentmessage()) {
     if (GetArenaForAllocation() == nullptr) {
-      delete header_.documentmessage_;
+      delete _impl_.header_.documentmessage_;
     }
     clear_has_header();
   }
@@ -43645,11 +45741,11 @@ inline ::proto::DocumentMessage* ButtonsMessage::release_documentmessage() {
   // @@protoc_insertion_point(field_release:proto.ButtonsMessage.documentMessage)
   if (_internal_has_documentmessage()) {
     clear_has_header();
-      ::proto::DocumentMessage* temp = header_.documentmessage_;
+    ::proto::DocumentMessage* temp = _impl_.header_.documentmessage_;
     if (GetArenaForAllocation() != nullptr) {
       temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
     }
-    header_.documentmessage_ = nullptr;
+    _impl_.header_.documentmessage_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -43657,7 +45753,7 @@ inline ::proto::DocumentMessage* ButtonsMessage::release_documentmessage() {
 }
 inline const ::proto::DocumentMessage& ButtonsMessage::_internal_documentmessage() const {
   return _internal_has_documentmessage()
-      ? *header_.documentmessage_
+      ? *_impl_.header_.documentmessage_
       : reinterpret_cast< ::proto::DocumentMessage&>(::proto::_DocumentMessage_default_instance_);
 }
 inline const ::proto::DocumentMessage& ButtonsMessage::documentmessage() const {
@@ -43668,8 +45764,8 @@ inline ::proto::DocumentMessage* ButtonsMessage::unsafe_arena_release_documentme
   // @@protoc_insertion_point(field_unsafe_arena_release:proto.ButtonsMessage.documentMessage)
   if (_internal_has_documentmessage()) {
     clear_has_header();
-    ::proto::DocumentMessage* temp = header_.documentmessage_;
-    header_.documentmessage_ = nullptr;
+    ::proto::DocumentMessage* temp = _impl_.header_.documentmessage_;
+    _impl_.header_.documentmessage_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -43679,7 +45775,7 @@ inline void ButtonsMessage::unsafe_arena_set_allocated_documentmessage(::proto::
   clear_header();
   if (documentmessage) {
     set_has_documentmessage();
-    header_.documentmessage_ = documentmessage;
+    _impl_.header_.documentmessage_ = documentmessage;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.ButtonsMessage.documentMessage)
 }
@@ -43687,9 +45783,9 @@ inline ::proto::DocumentMessage* ButtonsMessage::_internal_mutable_documentmessa
   if (!_internal_has_documentmessage()) {
     clear_header();
     set_has_documentmessage();
-    header_.documentmessage_ = CreateMaybeMessage< ::proto::DocumentMessage >(GetArenaForAllocation());
+    _impl_.header_.documentmessage_ = CreateMaybeMessage< ::proto::DocumentMessage >(GetArenaForAllocation());
   }
-  return header_.documentmessage_;
+  return _impl_.header_.documentmessage_;
 }
 inline ::proto::DocumentMessage* ButtonsMessage::mutable_documentmessage() {
   ::proto::DocumentMessage* _msg = _internal_mutable_documentmessage();
@@ -43705,12 +45801,12 @@ inline bool ButtonsMessage::has_imagemessage() const {
   return _internal_has_imagemessage();
 }
 inline void ButtonsMessage::set_has_imagemessage() {
-  _oneof_case_[0] = kImageMessage;
+  _impl_._oneof_case_[0] = kImageMessage;
 }
 inline void ButtonsMessage::clear_imagemessage() {
   if (_internal_has_imagemessage()) {
     if (GetArenaForAllocation() == nullptr) {
-      delete header_.imagemessage_;
+      delete _impl_.header_.imagemessage_;
     }
     clear_has_header();
   }
@@ -43719,11 +45815,11 @@ inline ::proto::ImageMessage* ButtonsMessage::release_imagemessage() {
   // @@protoc_insertion_point(field_release:proto.ButtonsMessage.imageMessage)
   if (_internal_has_imagemessage()) {
     clear_has_header();
-      ::proto::ImageMessage* temp = header_.imagemessage_;
+    ::proto::ImageMessage* temp = _impl_.header_.imagemessage_;
     if (GetArenaForAllocation() != nullptr) {
       temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
     }
-    header_.imagemessage_ = nullptr;
+    _impl_.header_.imagemessage_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -43731,7 +45827,7 @@ inline ::proto::ImageMessage* ButtonsMessage::release_imagemessage() {
 }
 inline const ::proto::ImageMessage& ButtonsMessage::_internal_imagemessage() const {
   return _internal_has_imagemessage()
-      ? *header_.imagemessage_
+      ? *_impl_.header_.imagemessage_
       : reinterpret_cast< ::proto::ImageMessage&>(::proto::_ImageMessage_default_instance_);
 }
 inline const ::proto::ImageMessage& ButtonsMessage::imagemessage() const {
@@ -43742,8 +45838,8 @@ inline ::proto::ImageMessage* ButtonsMessage::unsafe_arena_release_imagemessage(
   // @@protoc_insertion_point(field_unsafe_arena_release:proto.ButtonsMessage.imageMessage)
   if (_internal_has_imagemessage()) {
     clear_has_header();
-    ::proto::ImageMessage* temp = header_.imagemessage_;
-    header_.imagemessage_ = nullptr;
+    ::proto::ImageMessage* temp = _impl_.header_.imagemessage_;
+    _impl_.header_.imagemessage_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -43753,7 +45849,7 @@ inline void ButtonsMessage::unsafe_arena_set_allocated_imagemessage(::proto::Ima
   clear_header();
   if (imagemessage) {
     set_has_imagemessage();
-    header_.imagemessage_ = imagemessage;
+    _impl_.header_.imagemessage_ = imagemessage;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.ButtonsMessage.imageMessage)
 }
@@ -43761,9 +45857,9 @@ inline ::proto::ImageMessage* ButtonsMessage::_internal_mutable_imagemessage() {
   if (!_internal_has_imagemessage()) {
     clear_header();
     set_has_imagemessage();
-    header_.imagemessage_ = CreateMaybeMessage< ::proto::ImageMessage >(GetArenaForAllocation());
+    _impl_.header_.imagemessage_ = CreateMaybeMessage< ::proto::ImageMessage >(GetArenaForAllocation());
   }
-  return header_.imagemessage_;
+  return _impl_.header_.imagemessage_;
 }
 inline ::proto::ImageMessage* ButtonsMessage::mutable_imagemessage() {
   ::proto::ImageMessage* _msg = _internal_mutable_imagemessage();
@@ -43779,12 +45875,12 @@ inline bool ButtonsMessage::has_videomessage() const {
   return _internal_has_videomessage();
 }
 inline void ButtonsMessage::set_has_videomessage() {
-  _oneof_case_[0] = kVideoMessage;
+  _impl_._oneof_case_[0] = kVideoMessage;
 }
 inline void ButtonsMessage::clear_videomessage() {
   if (_internal_has_videomessage()) {
     if (GetArenaForAllocation() == nullptr) {
-      delete header_.videomessage_;
+      delete _impl_.header_.videomessage_;
     }
     clear_has_header();
   }
@@ -43793,11 +45889,11 @@ inline ::proto::VideoMessage* ButtonsMessage::release_videomessage() {
   // @@protoc_insertion_point(field_release:proto.ButtonsMessage.videoMessage)
   if (_internal_has_videomessage()) {
     clear_has_header();
-      ::proto::VideoMessage* temp = header_.videomessage_;
+    ::proto::VideoMessage* temp = _impl_.header_.videomessage_;
     if (GetArenaForAllocation() != nullptr) {
       temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
     }
-    header_.videomessage_ = nullptr;
+    _impl_.header_.videomessage_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -43805,7 +45901,7 @@ inline ::proto::VideoMessage* ButtonsMessage::release_videomessage() {
 }
 inline const ::proto::VideoMessage& ButtonsMessage::_internal_videomessage() const {
   return _internal_has_videomessage()
-      ? *header_.videomessage_
+      ? *_impl_.header_.videomessage_
       : reinterpret_cast< ::proto::VideoMessage&>(::proto::_VideoMessage_default_instance_);
 }
 inline const ::proto::VideoMessage& ButtonsMessage::videomessage() const {
@@ -43816,8 +45912,8 @@ inline ::proto::VideoMessage* ButtonsMessage::unsafe_arena_release_videomessage(
   // @@protoc_insertion_point(field_unsafe_arena_release:proto.ButtonsMessage.videoMessage)
   if (_internal_has_videomessage()) {
     clear_has_header();
-    ::proto::VideoMessage* temp = header_.videomessage_;
-    header_.videomessage_ = nullptr;
+    ::proto::VideoMessage* temp = _impl_.header_.videomessage_;
+    _impl_.header_.videomessage_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -43827,7 +45923,7 @@ inline void ButtonsMessage::unsafe_arena_set_allocated_videomessage(::proto::Vid
   clear_header();
   if (videomessage) {
     set_has_videomessage();
-    header_.videomessage_ = videomessage;
+    _impl_.header_.videomessage_ = videomessage;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.ButtonsMessage.videoMessage)
 }
@@ -43835,9 +45931,9 @@ inline ::proto::VideoMessage* ButtonsMessage::_internal_mutable_videomessage() {
   if (!_internal_has_videomessage()) {
     clear_header();
     set_has_videomessage();
-    header_.videomessage_ = CreateMaybeMessage< ::proto::VideoMessage >(GetArenaForAllocation());
+    _impl_.header_.videomessage_ = CreateMaybeMessage< ::proto::VideoMessage >(GetArenaForAllocation());
   }
-  return header_.videomessage_;
+  return _impl_.header_.videomessage_;
 }
 inline ::proto::VideoMessage* ButtonsMessage::mutable_videomessage() {
   ::proto::VideoMessage* _msg = _internal_mutable_videomessage();
@@ -43853,12 +45949,12 @@ inline bool ButtonsMessage::has_locationmessage() const {
   return _internal_has_locationmessage();
 }
 inline void ButtonsMessage::set_has_locationmessage() {
-  _oneof_case_[0] = kLocationMessage;
+  _impl_._oneof_case_[0] = kLocationMessage;
 }
 inline void ButtonsMessage::clear_locationmessage() {
   if (_internal_has_locationmessage()) {
     if (GetArenaForAllocation() == nullptr) {
-      delete header_.locationmessage_;
+      delete _impl_.header_.locationmessage_;
     }
     clear_has_header();
   }
@@ -43867,11 +45963,11 @@ inline ::proto::LocationMessage* ButtonsMessage::release_locationmessage() {
   // @@protoc_insertion_point(field_release:proto.ButtonsMessage.locationMessage)
   if (_internal_has_locationmessage()) {
     clear_has_header();
-      ::proto::LocationMessage* temp = header_.locationmessage_;
+    ::proto::LocationMessage* temp = _impl_.header_.locationmessage_;
     if (GetArenaForAllocation() != nullptr) {
       temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
     }
-    header_.locationmessage_ = nullptr;
+    _impl_.header_.locationmessage_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -43879,7 +45975,7 @@ inline ::proto::LocationMessage* ButtonsMessage::release_locationmessage() {
 }
 inline const ::proto::LocationMessage& ButtonsMessage::_internal_locationmessage() const {
   return _internal_has_locationmessage()
-      ? *header_.locationmessage_
+      ? *_impl_.header_.locationmessage_
       : reinterpret_cast< ::proto::LocationMessage&>(::proto::_LocationMessage_default_instance_);
 }
 inline const ::proto::LocationMessage& ButtonsMessage::locationmessage() const {
@@ -43890,8 +45986,8 @@ inline ::proto::LocationMessage* ButtonsMessage::unsafe_arena_release_locationme
   // @@protoc_insertion_point(field_unsafe_arena_release:proto.ButtonsMessage.locationMessage)
   if (_internal_has_locationmessage()) {
     clear_has_header();
-    ::proto::LocationMessage* temp = header_.locationmessage_;
-    header_.locationmessage_ = nullptr;
+    ::proto::LocationMessage* temp = _impl_.header_.locationmessage_;
+    _impl_.header_.locationmessage_ = nullptr;
     return temp;
   } else {
     return nullptr;
@@ -43901,7 +45997,7 @@ inline void ButtonsMessage::unsafe_arena_set_allocated_locationmessage(::proto::
   clear_header();
   if (locationmessage) {
     set_has_locationmessage();
-    header_.locationmessage_ = locationmessage;
+    _impl_.header_.locationmessage_ = locationmessage;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.ButtonsMessage.locationMessage)
 }
@@ -43909,9 +46005,9 @@ inline ::proto::LocationMessage* ButtonsMessage::_internal_mutable_locationmessa
   if (!_internal_has_locationmessage()) {
     clear_header();
     set_has_locationmessage();
-    header_.locationmessage_ = CreateMaybeMessage< ::proto::LocationMessage >(GetArenaForAllocation());
+    _impl_.header_.locationmessage_ = CreateMaybeMessage< ::proto::LocationMessage >(GetArenaForAllocation());
   }
-  return header_.locationmessage_;
+  return _impl_.header_.locationmessage_;
 }
 inline ::proto::LocationMessage* ButtonsMessage::mutable_locationmessage() {
   ::proto::LocationMessage* _msg = _internal_mutable_locationmessage();
@@ -43923,10 +46019,10 @@ inline bool ButtonsMessage::has_header() const {
   return header_case() != HEADER_NOT_SET;
 }
 inline void ButtonsMessage::clear_has_header() {
-  _oneof_case_[0] = HEADER_NOT_SET;
+  _impl_._oneof_case_[0] = HEADER_NOT_SET;
 }
 inline ButtonsMessage::HeaderCase ButtonsMessage::header_case() const {
-  return ButtonsMessage::HeaderCase(_oneof_case_[0]);
+  return ButtonsMessage::HeaderCase(_impl_._oneof_case_[0]);
 }
 // -------------------------------------------------------------------
 
@@ -43934,15 +46030,15 @@ inline ButtonsMessage::HeaderCase ButtonsMessage::header_case() const {
 
 // optional string selectedButtonId = 1;
 inline bool ButtonsResponseMessage::_internal_has_selectedbuttonid() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool ButtonsResponseMessage::has_selectedbuttonid() const {
   return _internal_has_selectedbuttonid();
 }
 inline void ButtonsResponseMessage::clear_selectedbuttonid() {
-  selectedbuttonid_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.selectedbuttonid_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& ButtonsResponseMessage::selectedbuttonid() const {
   // @@protoc_insertion_point(field_get:proto.ButtonsResponseMessage.selectedButtonId)
@@ -43951,8 +46047,8 @@ inline const std::string& ButtonsResponseMessage::selectedbuttonid() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void ButtonsResponseMessage::set_selectedbuttonid(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- selectedbuttonid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.selectedbuttonid_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ButtonsResponseMessage.selectedButtonId)
 }
 inline std::string* ButtonsResponseMessage::mutable_selectedbuttonid() {
@@ -43961,50 +46057,60 @@ inline std::string* ButtonsResponseMessage::mutable_selectedbuttonid() {
   return _s;
 }
 inline const std::string& ButtonsResponseMessage::_internal_selectedbuttonid() const {
-  return selectedbuttonid_.Get();
+  return _impl_.selectedbuttonid_.Get();
 }
 inline void ButtonsResponseMessage::_internal_set_selectedbuttonid(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  selectedbuttonid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.selectedbuttonid_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ButtonsResponseMessage::_internal_mutable_selectedbuttonid() {
-  _has_bits_[0] |= 0x00000001u;
-  return selectedbuttonid_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.selectedbuttonid_.Mutable(GetArenaForAllocation());
 }
 inline std::string* ButtonsResponseMessage::release_selectedbuttonid() {
   // @@protoc_insertion_point(field_release:proto.ButtonsResponseMessage.selectedButtonId)
   if (!_internal_has_selectedbuttonid()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return selectedbuttonid_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.selectedbuttonid_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.selectedbuttonid_.IsDefault()) {
+    _impl_.selectedbuttonid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void ButtonsResponseMessage::set_allocated_selectedbuttonid(std::string* selectedbuttonid) {
   if (selectedbuttonid != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
+  }
+  _impl_.selectedbuttonid_.SetAllocated(selectedbuttonid, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.selectedbuttonid_.IsDefault()) {
+    _impl_.selectedbuttonid_.Set("", GetArenaForAllocation());
   }
-  selectedbuttonid_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), selectedbuttonid,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.ButtonsResponseMessage.selectedButtonId)
 }
 
 // optional .proto.ContextInfo contextInfo = 3;
 inline bool ButtonsResponseMessage::_internal_has_contextinfo() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || contextinfo_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.contextinfo_ != nullptr);
   return value;
 }
 inline bool ButtonsResponseMessage::has_contextinfo() const {
   return _internal_has_contextinfo();
 }
 inline void ButtonsResponseMessage::clear_contextinfo() {
-  if (contextinfo_ != nullptr) contextinfo_->Clear();
-  _has_bits_[0] &= ~0x00000002u;
+  if (_impl_.contextinfo_ != nullptr) _impl_.contextinfo_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const ::proto::ContextInfo& ButtonsResponseMessage::_internal_contextinfo() const {
-  const ::proto::ContextInfo* p = contextinfo_;
+  const ::proto::ContextInfo* p = _impl_.contextinfo_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ContextInfo&>(
       ::proto::_ContextInfo_default_instance_);
 }
@@ -44015,20 +46121,20 @@ inline const ::proto::ContextInfo& ButtonsResponseMessage::contextinfo() const {
 inline void ButtonsResponseMessage::unsafe_arena_set_allocated_contextinfo(
     ::proto::ContextInfo* contextinfo) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(contextinfo_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.contextinfo_);
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   if (contextinfo) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.ButtonsResponseMessage.contextInfo)
 }
 inline ::proto::ContextInfo* ButtonsResponseMessage::release_contextinfo() {
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -44042,18 +46148,18 @@ inline ::proto::ContextInfo* ButtonsResponseMessage::release_contextinfo() {
 }
 inline ::proto::ContextInfo* ButtonsResponseMessage::unsafe_arena_release_contextinfo() {
   // @@protoc_insertion_point(field_release:proto.ButtonsResponseMessage.contextInfo)
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::ContextInfo* temp = contextinfo_;
-  contextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::ContextInfo* temp = _impl_.contextinfo_;
+  _impl_.contextinfo_ = nullptr;
   return temp;
 }
 inline ::proto::ContextInfo* ButtonsResponseMessage::_internal_mutable_contextinfo() {
-  _has_bits_[0] |= 0x00000002u;
-  if (contextinfo_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000002u;
+  if (_impl_.contextinfo_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ContextInfo>(GetArenaForAllocation());
-    contextinfo_ = p;
+    _impl_.contextinfo_ = p;
   }
-  return contextinfo_;
+  return _impl_.contextinfo_;
 }
 inline ::proto::ContextInfo* ButtonsResponseMessage::mutable_contextinfo() {
   ::proto::ContextInfo* _msg = _internal_mutable_contextinfo();
@@ -44063,37 +46169,37 @@ inline ::proto::ContextInfo* ButtonsResponseMessage::mutable_contextinfo() {
 inline void ButtonsResponseMessage::set_allocated_contextinfo(::proto::ContextInfo* contextinfo) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete contextinfo_;
+    delete _impl_.contextinfo_;
   }
   if (contextinfo) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ContextInfo>::GetOwningArena(contextinfo);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(contextinfo);
     if (message_arena != submessage_arena) {
       contextinfo = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, contextinfo, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  contextinfo_ = contextinfo;
+  _impl_.contextinfo_ = contextinfo;
   // @@protoc_insertion_point(field_set_allocated:proto.ButtonsResponseMessage.contextInfo)
 }
 
 // optional .proto.ButtonsResponseMessage.ButtonsResponseMessageType type = 4;
 inline bool ButtonsResponseMessage::_internal_has_type() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool ButtonsResponseMessage::has_type() const {
   return _internal_has_type();
 }
 inline void ButtonsResponseMessage::clear_type() {
-  type_ = 0;
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.type_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline ::proto::ButtonsResponseMessage_ButtonsResponseMessageType ButtonsResponseMessage::_internal_type() const {
-  return static_cast< ::proto::ButtonsResponseMessage_ButtonsResponseMessageType >(type_);
+  return static_cast< ::proto::ButtonsResponseMessage_ButtonsResponseMessageType >(_impl_.type_);
 }
 inline ::proto::ButtonsResponseMessage_ButtonsResponseMessageType ButtonsResponseMessage::type() const {
   // @@protoc_insertion_point(field_get:proto.ButtonsResponseMessage.type)
@@ -44101,8 +46207,8 @@ inline ::proto::ButtonsResponseMessage_ButtonsResponseMessageType ButtonsRespons
 }
 inline void ButtonsResponseMessage::_internal_set_type(::proto::ButtonsResponseMessage_ButtonsResponseMessageType value) {
   assert(::proto::ButtonsResponseMessage_ButtonsResponseMessageType_IsValid(value));
-  _has_bits_[0] |= 0x00000004u;
-  type_ = value;
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.type_ = value;
 }
 inline void ButtonsResponseMessage::set_type(::proto::ButtonsResponseMessage_ButtonsResponseMessageType value) {
   _internal_set_type(value);
@@ -44117,11 +46223,11 @@ inline bool ButtonsResponseMessage::has_selecteddisplaytext() const {
   return _internal_has_selecteddisplaytext();
 }
 inline void ButtonsResponseMessage::set_has_selecteddisplaytext() {
-  _oneof_case_[0] = kSelectedDisplayText;
+  _impl_._oneof_case_[0] = kSelectedDisplayText;
 }
 inline void ButtonsResponseMessage::clear_selecteddisplaytext() {
   if (_internal_has_selecteddisplaytext()) {
-    response_.selecteddisplaytext_.Destroy(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+    _impl_.response_.selecteddisplaytext_.Destroy();
     clear_has_response();
   }
 }
@@ -44134,9 +46240,9 @@ inline void ButtonsResponseMessage::set_selecteddisplaytext(ArgT0&& arg0, ArgT..
   if (!_internal_has_selecteddisplaytext()) {
     clear_response();
     set_has_selecteddisplaytext();
-    response_.selecteddisplaytext_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+    _impl_.response_.selecteddisplaytext_.InitDefault();
   }
-  response_.selecteddisplaytext_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+  _impl_.response_.selecteddisplaytext_.Set( static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.ButtonsResponseMessage.selectedDisplayText)
 }
 inline std::string* ButtonsResponseMessage::mutable_selecteddisplaytext() {
@@ -44146,7 +46252,7 @@ inline std::string* ButtonsResponseMessage::mutable_selecteddisplaytext() {
 }
 inline const std::string& ButtonsResponseMessage::_internal_selecteddisplaytext() const {
   if (_internal_has_selecteddisplaytext()) {
-    return response_.selecteddisplaytext_.Get();
+    return _impl_.response_.selecteddisplaytext_.Get();
   }
   return ::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited();
 }
@@ -44154,24 +46260,23 @@ inline void ButtonsResponseMessage::_internal_set_selecteddisplaytext(const std:
   if (!_internal_has_selecteddisplaytext()) {
     clear_response();
     set_has_selecteddisplaytext();
-    response_.selecteddisplaytext_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+    _impl_.response_.selecteddisplaytext_.InitDefault();
   }
-  response_.selecteddisplaytext_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_.response_.selecteddisplaytext_.Set(value, GetArenaForAllocation());
 }
 inline std::string* ButtonsResponseMessage::_internal_mutable_selecteddisplaytext() {
   if (!_internal_has_selecteddisplaytext()) {
     clear_response();
     set_has_selecteddisplaytext();
-    response_.selecteddisplaytext_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+    _impl_.response_.selecteddisplaytext_.InitDefault();
   }
-  return response_.selecteddisplaytext_.Mutable(
-      ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  return _impl_.response_.selecteddisplaytext_.Mutable(      GetArenaForAllocation());
 }
 inline std::string* ButtonsResponseMessage::release_selecteddisplaytext() {
   // @@protoc_insertion_point(field_release:proto.ButtonsResponseMessage.selectedDisplayText)
   if (_internal_has_selecteddisplaytext()) {
     clear_has_response();
-    return response_.selecteddisplaytext_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+    return _impl_.response_.selecteddisplaytext_.Release();
   } else {
     return nullptr;
   }
@@ -44182,11 +46287,7 @@ inline void ButtonsResponseMessage::set_allocated_selecteddisplaytext(std::strin
   }
   if (selecteddisplaytext != nullptr) {
     set_has_selecteddisplaytext();
-    response_.selecteddisplaytext_.UnsafeSetDefault(selecteddisplaytext);
-    ::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArenaForAllocation();
-    if (arena != nullptr) {
-      arena->Own(selecteddisplaytext);
-    }
+    _impl_.response_.selecteddisplaytext_.InitAllocated(selecteddisplaytext, GetArenaForAllocation());
   }
   // @@protoc_insertion_point(field_set_allocated:proto.ButtonsResponseMessage.selectedDisplayText)
 }
@@ -44195,10 +46296,10 @@ inline bool ButtonsResponseMessage::has_response() const {
   return response_case() != RESPONSE_NOT_SET;
 }
 inline void ButtonsResponseMessage::clear_has_response() {
-  _oneof_case_[0] = RESPONSE_NOT_SET;
+  _impl_._oneof_case_[0] = RESPONSE_NOT_SET;
 }
 inline ButtonsResponseMessage::ResponseCase ButtonsResponseMessage::response_case() const {
-  return ButtonsResponseMessage::ResponseCase(_oneof_case_[0]);
+  return ButtonsResponseMessage::ResponseCase(_impl_._oneof_case_[0]);
 }
 // -------------------------------------------------------------------
 
@@ -44206,15 +46307,15 @@ inline ButtonsResponseMessage::ResponseCase ButtonsResponseMessage::response_cas
 
 // optional string conversation = 1;
 inline bool Message::_internal_has_conversation() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool Message::has_conversation() const {
   return _internal_has_conversation();
 }
 inline void Message::clear_conversation() {
-  conversation_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.conversation_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& Message::conversation() const {
   // @@protoc_insertion_point(field_get:proto.Message.conversation)
@@ -44223,8 +46324,8 @@ inline const std::string& Message::conversation() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void Message::set_conversation(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- conversation_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.conversation_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.Message.conversation)
 }
 inline std::string* Message::mutable_conversation() {
@@ -44233,50 +46334,60 @@ inline std::string* Message::mutable_conversation() {
   return _s;
 }
 inline const std::string& Message::_internal_conversation() const {
-  return conversation_.Get();
+  return _impl_.conversation_.Get();
 }
 inline void Message::_internal_set_conversation(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  conversation_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.conversation_.Set(value, GetArenaForAllocation());
 }
 inline std::string* Message::_internal_mutable_conversation() {
-  _has_bits_[0] |= 0x00000001u;
-  return conversation_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.conversation_.Mutable(GetArenaForAllocation());
 }
 inline std::string* Message::release_conversation() {
   // @@protoc_insertion_point(field_release:proto.Message.conversation)
   if (!_internal_has_conversation()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return conversation_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.conversation_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.conversation_.IsDefault()) {
+    _impl_.conversation_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void Message::set_allocated_conversation(std::string* conversation) {
   if (conversation != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  conversation_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), conversation,
-      GetArenaForAllocation());
+  _impl_.conversation_.SetAllocated(conversation, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.conversation_.IsDefault()) {
+    _impl_.conversation_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.Message.conversation)
 }
 
 // optional .proto.SenderKeyDistributionMessage senderKeyDistributionMessage = 2;
 inline bool Message::_internal_has_senderkeydistributionmessage() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || senderkeydistributionmessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.senderkeydistributionmessage_ != nullptr);
   return value;
 }
 inline bool Message::has_senderkeydistributionmessage() const {
   return _internal_has_senderkeydistributionmessage();
 }
 inline void Message::clear_senderkeydistributionmessage() {
-  if (senderkeydistributionmessage_ != nullptr) senderkeydistributionmessage_->Clear();
-  _has_bits_[0] &= ~0x00000002u;
+  if (_impl_.senderkeydistributionmessage_ != nullptr) _impl_.senderkeydistributionmessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const ::proto::SenderKeyDistributionMessage& Message::_internal_senderkeydistributionmessage() const {
-  const ::proto::SenderKeyDistributionMessage* p = senderkeydistributionmessage_;
+  const ::proto::SenderKeyDistributionMessage* p = _impl_.senderkeydistributionmessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::SenderKeyDistributionMessage&>(
       ::proto::_SenderKeyDistributionMessage_default_instance_);
 }
@@ -44287,20 +46398,20 @@ inline const ::proto::SenderKeyDistributionMessage& Message::senderkeydistributi
 inline void Message::unsafe_arena_set_allocated_senderkeydistributionmessage(
     ::proto::SenderKeyDistributionMessage* senderkeydistributionmessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(senderkeydistributionmessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.senderkeydistributionmessage_);
   }
-  senderkeydistributionmessage_ = senderkeydistributionmessage;
+  _impl_.senderkeydistributionmessage_ = senderkeydistributionmessage;
   if (senderkeydistributionmessage) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.senderKeyDistributionMessage)
 }
 inline ::proto::SenderKeyDistributionMessage* Message::release_senderkeydistributionmessage() {
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::SenderKeyDistributionMessage* temp = senderkeydistributionmessage_;
-  senderkeydistributionmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::SenderKeyDistributionMessage* temp = _impl_.senderkeydistributionmessage_;
+  _impl_.senderkeydistributionmessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -44314,18 +46425,18 @@ inline ::proto::SenderKeyDistributionMessage* Message::release_senderkeydistribu
 }
 inline ::proto::SenderKeyDistributionMessage* Message::unsafe_arena_release_senderkeydistributionmessage() {
   // @@protoc_insertion_point(field_release:proto.Message.senderKeyDistributionMessage)
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::SenderKeyDistributionMessage* temp = senderkeydistributionmessage_;
-  senderkeydistributionmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::SenderKeyDistributionMessage* temp = _impl_.senderkeydistributionmessage_;
+  _impl_.senderkeydistributionmessage_ = nullptr;
   return temp;
 }
 inline ::proto::SenderKeyDistributionMessage* Message::_internal_mutable_senderkeydistributionmessage() {
-  _has_bits_[0] |= 0x00000002u;
-  if (senderkeydistributionmessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000002u;
+  if (_impl_.senderkeydistributionmessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::SenderKeyDistributionMessage>(GetArenaForAllocation());
-    senderkeydistributionmessage_ = p;
+    _impl_.senderkeydistributionmessage_ = p;
   }
-  return senderkeydistributionmessage_;
+  return _impl_.senderkeydistributionmessage_;
 }
 inline ::proto::SenderKeyDistributionMessage* Message::mutable_senderkeydistributionmessage() {
   ::proto::SenderKeyDistributionMessage* _msg = _internal_mutable_senderkeydistributionmessage();
@@ -44335,38 +46446,38 @@ inline ::proto::SenderKeyDistributionMessage* Message::mutable_senderkeydistribu
 inline void Message::set_allocated_senderkeydistributionmessage(::proto::SenderKeyDistributionMessage* senderkeydistributionmessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete senderkeydistributionmessage_;
+    delete _impl_.senderkeydistributionmessage_;
   }
   if (senderkeydistributionmessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::SenderKeyDistributionMessage>::GetOwningArena(senderkeydistributionmessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(senderkeydistributionmessage);
     if (message_arena != submessage_arena) {
       senderkeydistributionmessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, senderkeydistributionmessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  senderkeydistributionmessage_ = senderkeydistributionmessage;
+  _impl_.senderkeydistributionmessage_ = senderkeydistributionmessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.senderKeyDistributionMessage)
 }
 
 // optional .proto.ImageMessage imageMessage = 3;
 inline bool Message::_internal_has_imagemessage() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || imagemessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.imagemessage_ != nullptr);
   return value;
 }
 inline bool Message::has_imagemessage() const {
   return _internal_has_imagemessage();
 }
 inline void Message::clear_imagemessage() {
-  if (imagemessage_ != nullptr) imagemessage_->Clear();
-  _has_bits_[0] &= ~0x00000004u;
+  if (_impl_.imagemessage_ != nullptr) _impl_.imagemessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const ::proto::ImageMessage& Message::_internal_imagemessage() const {
-  const ::proto::ImageMessage* p = imagemessage_;
+  const ::proto::ImageMessage* p = _impl_.imagemessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ImageMessage&>(
       ::proto::_ImageMessage_default_instance_);
 }
@@ -44377,20 +46488,20 @@ inline const ::proto::ImageMessage& Message::imagemessage() const {
 inline void Message::unsafe_arena_set_allocated_imagemessage(
     ::proto::ImageMessage* imagemessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(imagemessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.imagemessage_);
   }
-  imagemessage_ = imagemessage;
+  _impl_.imagemessage_ = imagemessage;
   if (imagemessage) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.imageMessage)
 }
 inline ::proto::ImageMessage* Message::release_imagemessage() {
-  _has_bits_[0] &= ~0x00000004u;
-  ::proto::ImageMessage* temp = imagemessage_;
-  imagemessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::proto::ImageMessage* temp = _impl_.imagemessage_;
+  _impl_.imagemessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -44404,18 +46515,18 @@ inline ::proto::ImageMessage* Message::release_imagemessage() {
 }
 inline ::proto::ImageMessage* Message::unsafe_arena_release_imagemessage() {
   // @@protoc_insertion_point(field_release:proto.Message.imageMessage)
-  _has_bits_[0] &= ~0x00000004u;
-  ::proto::ImageMessage* temp = imagemessage_;
-  imagemessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::proto::ImageMessage* temp = _impl_.imagemessage_;
+  _impl_.imagemessage_ = nullptr;
   return temp;
 }
 inline ::proto::ImageMessage* Message::_internal_mutable_imagemessage() {
-  _has_bits_[0] |= 0x00000004u;
-  if (imagemessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000004u;
+  if (_impl_.imagemessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ImageMessage>(GetArenaForAllocation());
-    imagemessage_ = p;
+    _impl_.imagemessage_ = p;
   }
-  return imagemessage_;
+  return _impl_.imagemessage_;
 }
 inline ::proto::ImageMessage* Message::mutable_imagemessage() {
   ::proto::ImageMessage* _msg = _internal_mutable_imagemessage();
@@ -44425,38 +46536,38 @@ inline ::proto::ImageMessage* Message::mutable_imagemessage() {
 inline void Message::set_allocated_imagemessage(::proto::ImageMessage* imagemessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete imagemessage_;
+    delete _impl_.imagemessage_;
   }
   if (imagemessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ImageMessage>::GetOwningArena(imagemessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(imagemessage);
     if (message_arena != submessage_arena) {
       imagemessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, imagemessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
-  imagemessage_ = imagemessage;
+  _impl_.imagemessage_ = imagemessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.imageMessage)
 }
 
 // optional .proto.ContactMessage contactMessage = 4;
 inline bool Message::_internal_has_contactmessage() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
-  PROTOBUF_ASSUME(!value || contactmessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.contactmessage_ != nullptr);
   return value;
 }
 inline bool Message::has_contactmessage() const {
   return _internal_has_contactmessage();
 }
 inline void Message::clear_contactmessage() {
-  if (contactmessage_ != nullptr) contactmessage_->Clear();
-  _has_bits_[0] &= ~0x00000008u;
+  if (_impl_.contactmessage_ != nullptr) _impl_.contactmessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline const ::proto::ContactMessage& Message::_internal_contactmessage() const {
-  const ::proto::ContactMessage* p = contactmessage_;
+  const ::proto::ContactMessage* p = _impl_.contactmessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ContactMessage&>(
       ::proto::_ContactMessage_default_instance_);
 }
@@ -44467,20 +46578,20 @@ inline const ::proto::ContactMessage& Message::contactmessage() const {
 inline void Message::unsafe_arena_set_allocated_contactmessage(
     ::proto::ContactMessage* contactmessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(contactmessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.contactmessage_);
   }
-  contactmessage_ = contactmessage;
+  _impl_.contactmessage_ = contactmessage;
   if (contactmessage) {
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.contactMessage)
 }
 inline ::proto::ContactMessage* Message::release_contactmessage() {
-  _has_bits_[0] &= ~0x00000008u;
-  ::proto::ContactMessage* temp = contactmessage_;
-  contactmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  ::proto::ContactMessage* temp = _impl_.contactmessage_;
+  _impl_.contactmessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -44494,18 +46605,18 @@ inline ::proto::ContactMessage* Message::release_contactmessage() {
 }
 inline ::proto::ContactMessage* Message::unsafe_arena_release_contactmessage() {
   // @@protoc_insertion_point(field_release:proto.Message.contactMessage)
-  _has_bits_[0] &= ~0x00000008u;
-  ::proto::ContactMessage* temp = contactmessage_;
-  contactmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  ::proto::ContactMessage* temp = _impl_.contactmessage_;
+  _impl_.contactmessage_ = nullptr;
   return temp;
 }
 inline ::proto::ContactMessage* Message::_internal_mutable_contactmessage() {
-  _has_bits_[0] |= 0x00000008u;
-  if (contactmessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000008u;
+  if (_impl_.contactmessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ContactMessage>(GetArenaForAllocation());
-    contactmessage_ = p;
+    _impl_.contactmessage_ = p;
   }
-  return contactmessage_;
+  return _impl_.contactmessage_;
 }
 inline ::proto::ContactMessage* Message::mutable_contactmessage() {
   ::proto::ContactMessage* _msg = _internal_mutable_contactmessage();
@@ -44515,38 +46626,38 @@ inline ::proto::ContactMessage* Message::mutable_contactmessage() {
 inline void Message::set_allocated_contactmessage(::proto::ContactMessage* contactmessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete contactmessage_;
+    delete _impl_.contactmessage_;
   }
   if (contactmessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ContactMessage>::GetOwningArena(contactmessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(contactmessage);
     if (message_arena != submessage_arena) {
       contactmessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, contactmessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
   }
-  contactmessage_ = contactmessage;
+  _impl_.contactmessage_ = contactmessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.contactMessage)
 }
 
 // optional .proto.LocationMessage locationMessage = 5;
 inline bool Message::_internal_has_locationmessage() const {
-  bool value = (_has_bits_[0] & 0x00000010u) != 0;
-  PROTOBUF_ASSUME(!value || locationmessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.locationmessage_ != nullptr);
   return value;
 }
 inline bool Message::has_locationmessage() const {
   return _internal_has_locationmessage();
 }
 inline void Message::clear_locationmessage() {
-  if (locationmessage_ != nullptr) locationmessage_->Clear();
-  _has_bits_[0] &= ~0x00000010u;
+  if (_impl_.locationmessage_ != nullptr) _impl_.locationmessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000010u;
 }
 inline const ::proto::LocationMessage& Message::_internal_locationmessage() const {
-  const ::proto::LocationMessage* p = locationmessage_;
+  const ::proto::LocationMessage* p = _impl_.locationmessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::LocationMessage&>(
       ::proto::_LocationMessage_default_instance_);
 }
@@ -44557,20 +46668,20 @@ inline const ::proto::LocationMessage& Message::locationmessage() const {
 inline void Message::unsafe_arena_set_allocated_locationmessage(
     ::proto::LocationMessage* locationmessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(locationmessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.locationmessage_);
   }
-  locationmessage_ = locationmessage;
+  _impl_.locationmessage_ = locationmessage;
   if (locationmessage) {
-    _has_bits_[0] |= 0x00000010u;
+    _impl_._has_bits_[0] |= 0x00000010u;
   } else {
-    _has_bits_[0] &= ~0x00000010u;
+    _impl_._has_bits_[0] &= ~0x00000010u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.locationMessage)
 }
 inline ::proto::LocationMessage* Message::release_locationmessage() {
-  _has_bits_[0] &= ~0x00000010u;
-  ::proto::LocationMessage* temp = locationmessage_;
-  locationmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000010u;
+  ::proto::LocationMessage* temp = _impl_.locationmessage_;
+  _impl_.locationmessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -44584,18 +46695,18 @@ inline ::proto::LocationMessage* Message::release_locationmessage() {
 }
 inline ::proto::LocationMessage* Message::unsafe_arena_release_locationmessage() {
   // @@protoc_insertion_point(field_release:proto.Message.locationMessage)
-  _has_bits_[0] &= ~0x00000010u;
-  ::proto::LocationMessage* temp = locationmessage_;
-  locationmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000010u;
+  ::proto::LocationMessage* temp = _impl_.locationmessage_;
+  _impl_.locationmessage_ = nullptr;
   return temp;
 }
 inline ::proto::LocationMessage* Message::_internal_mutable_locationmessage() {
-  _has_bits_[0] |= 0x00000010u;
-  if (locationmessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000010u;
+  if (_impl_.locationmessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::LocationMessage>(GetArenaForAllocation());
-    locationmessage_ = p;
+    _impl_.locationmessage_ = p;
   }
-  return locationmessage_;
+  return _impl_.locationmessage_;
 }
 inline ::proto::LocationMessage* Message::mutable_locationmessage() {
   ::proto::LocationMessage* _msg = _internal_mutable_locationmessage();
@@ -44605,38 +46716,38 @@ inline ::proto::LocationMessage* Message::mutable_locationmessage() {
 inline void Message::set_allocated_locationmessage(::proto::LocationMessage* locationmessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete locationmessage_;
+    delete _impl_.locationmessage_;
   }
   if (locationmessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::LocationMessage>::GetOwningArena(locationmessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(locationmessage);
     if (message_arena != submessage_arena) {
       locationmessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, locationmessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000010u;
+    _impl_._has_bits_[0] |= 0x00000010u;
   } else {
-    _has_bits_[0] &= ~0x00000010u;
+    _impl_._has_bits_[0] &= ~0x00000010u;
   }
-  locationmessage_ = locationmessage;
+  _impl_.locationmessage_ = locationmessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.locationMessage)
 }
 
 // optional .proto.ExtendedTextMessage extendedTextMessage = 6;
 inline bool Message::_internal_has_extendedtextmessage() const {
-  bool value = (_has_bits_[0] & 0x00000020u) != 0;
-  PROTOBUF_ASSUME(!value || extendedtextmessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.extendedtextmessage_ != nullptr);
   return value;
 }
 inline bool Message::has_extendedtextmessage() const {
   return _internal_has_extendedtextmessage();
 }
 inline void Message::clear_extendedtextmessage() {
-  if (extendedtextmessage_ != nullptr) extendedtextmessage_->Clear();
-  _has_bits_[0] &= ~0x00000020u;
+  if (_impl_.extendedtextmessage_ != nullptr) _impl_.extendedtextmessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000020u;
 }
 inline const ::proto::ExtendedTextMessage& Message::_internal_extendedtextmessage() const {
-  const ::proto::ExtendedTextMessage* p = extendedtextmessage_;
+  const ::proto::ExtendedTextMessage* p = _impl_.extendedtextmessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ExtendedTextMessage&>(
       ::proto::_ExtendedTextMessage_default_instance_);
 }
@@ -44647,20 +46758,20 @@ inline const ::proto::ExtendedTextMessage& Message::extendedtextmessage() const
 inline void Message::unsafe_arena_set_allocated_extendedtextmessage(
     ::proto::ExtendedTextMessage* extendedtextmessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(extendedtextmessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.extendedtextmessage_);
   }
-  extendedtextmessage_ = extendedtextmessage;
+  _impl_.extendedtextmessage_ = extendedtextmessage;
   if (extendedtextmessage) {
-    _has_bits_[0] |= 0x00000020u;
+    _impl_._has_bits_[0] |= 0x00000020u;
   } else {
-    _has_bits_[0] &= ~0x00000020u;
+    _impl_._has_bits_[0] &= ~0x00000020u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.extendedTextMessage)
 }
 inline ::proto::ExtendedTextMessage* Message::release_extendedtextmessage() {
-  _has_bits_[0] &= ~0x00000020u;
-  ::proto::ExtendedTextMessage* temp = extendedtextmessage_;
-  extendedtextmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000020u;
+  ::proto::ExtendedTextMessage* temp = _impl_.extendedtextmessage_;
+  _impl_.extendedtextmessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -44674,18 +46785,18 @@ inline ::proto::ExtendedTextMessage* Message::release_extendedtextmessage() {
 }
 inline ::proto::ExtendedTextMessage* Message::unsafe_arena_release_extendedtextmessage() {
   // @@protoc_insertion_point(field_release:proto.Message.extendedTextMessage)
-  _has_bits_[0] &= ~0x00000020u;
-  ::proto::ExtendedTextMessage* temp = extendedtextmessage_;
-  extendedtextmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000020u;
+  ::proto::ExtendedTextMessage* temp = _impl_.extendedtextmessage_;
+  _impl_.extendedtextmessage_ = nullptr;
   return temp;
 }
 inline ::proto::ExtendedTextMessage* Message::_internal_mutable_extendedtextmessage() {
-  _has_bits_[0] |= 0x00000020u;
-  if (extendedtextmessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000020u;
+  if (_impl_.extendedtextmessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ExtendedTextMessage>(GetArenaForAllocation());
-    extendedtextmessage_ = p;
+    _impl_.extendedtextmessage_ = p;
   }
-  return extendedtextmessage_;
+  return _impl_.extendedtextmessage_;
 }
 inline ::proto::ExtendedTextMessage* Message::mutable_extendedtextmessage() {
   ::proto::ExtendedTextMessage* _msg = _internal_mutable_extendedtextmessage();
@@ -44695,38 +46806,38 @@ inline ::proto::ExtendedTextMessage* Message::mutable_extendedtextmessage() {
 inline void Message::set_allocated_extendedtextmessage(::proto::ExtendedTextMessage* extendedtextmessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete extendedtextmessage_;
+    delete _impl_.extendedtextmessage_;
   }
   if (extendedtextmessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ExtendedTextMessage>::GetOwningArena(extendedtextmessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(extendedtextmessage);
     if (message_arena != submessage_arena) {
       extendedtextmessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, extendedtextmessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000020u;
+    _impl_._has_bits_[0] |= 0x00000020u;
   } else {
-    _has_bits_[0] &= ~0x00000020u;
+    _impl_._has_bits_[0] &= ~0x00000020u;
   }
-  extendedtextmessage_ = extendedtextmessage;
+  _impl_.extendedtextmessage_ = extendedtextmessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.extendedTextMessage)
 }
 
 // optional .proto.DocumentMessage documentMessage = 7;
 inline bool Message::_internal_has_documentmessage() const {
-  bool value = (_has_bits_[0] & 0x00000040u) != 0;
-  PROTOBUF_ASSUME(!value || documentmessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.documentmessage_ != nullptr);
   return value;
 }
 inline bool Message::has_documentmessage() const {
   return _internal_has_documentmessage();
 }
 inline void Message::clear_documentmessage() {
-  if (documentmessage_ != nullptr) documentmessage_->Clear();
-  _has_bits_[0] &= ~0x00000040u;
+  if (_impl_.documentmessage_ != nullptr) _impl_.documentmessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000040u;
 }
 inline const ::proto::DocumentMessage& Message::_internal_documentmessage() const {
-  const ::proto::DocumentMessage* p = documentmessage_;
+  const ::proto::DocumentMessage* p = _impl_.documentmessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::DocumentMessage&>(
       ::proto::_DocumentMessage_default_instance_);
 }
@@ -44737,20 +46848,20 @@ inline const ::proto::DocumentMessage& Message::documentmessage() const {
 inline void Message::unsafe_arena_set_allocated_documentmessage(
     ::proto::DocumentMessage* documentmessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(documentmessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.documentmessage_);
   }
-  documentmessage_ = documentmessage;
+  _impl_.documentmessage_ = documentmessage;
   if (documentmessage) {
-    _has_bits_[0] |= 0x00000040u;
+    _impl_._has_bits_[0] |= 0x00000040u;
   } else {
-    _has_bits_[0] &= ~0x00000040u;
+    _impl_._has_bits_[0] &= ~0x00000040u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.documentMessage)
 }
 inline ::proto::DocumentMessage* Message::release_documentmessage() {
-  _has_bits_[0] &= ~0x00000040u;
-  ::proto::DocumentMessage* temp = documentmessage_;
-  documentmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000040u;
+  ::proto::DocumentMessage* temp = _impl_.documentmessage_;
+  _impl_.documentmessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -44764,18 +46875,18 @@ inline ::proto::DocumentMessage* Message::release_documentmessage() {
 }
 inline ::proto::DocumentMessage* Message::unsafe_arena_release_documentmessage() {
   // @@protoc_insertion_point(field_release:proto.Message.documentMessage)
-  _has_bits_[0] &= ~0x00000040u;
-  ::proto::DocumentMessage* temp = documentmessage_;
-  documentmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000040u;
+  ::proto::DocumentMessage* temp = _impl_.documentmessage_;
+  _impl_.documentmessage_ = nullptr;
   return temp;
 }
 inline ::proto::DocumentMessage* Message::_internal_mutable_documentmessage() {
-  _has_bits_[0] |= 0x00000040u;
-  if (documentmessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000040u;
+  if (_impl_.documentmessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::DocumentMessage>(GetArenaForAllocation());
-    documentmessage_ = p;
+    _impl_.documentmessage_ = p;
   }
-  return documentmessage_;
+  return _impl_.documentmessage_;
 }
 inline ::proto::DocumentMessage* Message::mutable_documentmessage() {
   ::proto::DocumentMessage* _msg = _internal_mutable_documentmessage();
@@ -44785,38 +46896,38 @@ inline ::proto::DocumentMessage* Message::mutable_documentmessage() {
 inline void Message::set_allocated_documentmessage(::proto::DocumentMessage* documentmessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete documentmessage_;
+    delete _impl_.documentmessage_;
   }
   if (documentmessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::DocumentMessage>::GetOwningArena(documentmessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(documentmessage);
     if (message_arena != submessage_arena) {
       documentmessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, documentmessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000040u;
+    _impl_._has_bits_[0] |= 0x00000040u;
   } else {
-    _has_bits_[0] &= ~0x00000040u;
+    _impl_._has_bits_[0] &= ~0x00000040u;
   }
-  documentmessage_ = documentmessage;
+  _impl_.documentmessage_ = documentmessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.documentMessage)
 }
 
 // optional .proto.AudioMessage audioMessage = 8;
 inline bool Message::_internal_has_audiomessage() const {
-  bool value = (_has_bits_[0] & 0x00000080u) != 0;
-  PROTOBUF_ASSUME(!value || audiomessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000080u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.audiomessage_ != nullptr);
   return value;
 }
 inline bool Message::has_audiomessage() const {
   return _internal_has_audiomessage();
 }
 inline void Message::clear_audiomessage() {
-  if (audiomessage_ != nullptr) audiomessage_->Clear();
-  _has_bits_[0] &= ~0x00000080u;
+  if (_impl_.audiomessage_ != nullptr) _impl_.audiomessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000080u;
 }
 inline const ::proto::AudioMessage& Message::_internal_audiomessage() const {
-  const ::proto::AudioMessage* p = audiomessage_;
+  const ::proto::AudioMessage* p = _impl_.audiomessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::AudioMessage&>(
       ::proto::_AudioMessage_default_instance_);
 }
@@ -44827,20 +46938,20 @@ inline const ::proto::AudioMessage& Message::audiomessage() const {
 inline void Message::unsafe_arena_set_allocated_audiomessage(
     ::proto::AudioMessage* audiomessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(audiomessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.audiomessage_);
   }
-  audiomessage_ = audiomessage;
+  _impl_.audiomessage_ = audiomessage;
   if (audiomessage) {
-    _has_bits_[0] |= 0x00000080u;
+    _impl_._has_bits_[0] |= 0x00000080u;
   } else {
-    _has_bits_[0] &= ~0x00000080u;
+    _impl_._has_bits_[0] &= ~0x00000080u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.audioMessage)
 }
 inline ::proto::AudioMessage* Message::release_audiomessage() {
-  _has_bits_[0] &= ~0x00000080u;
-  ::proto::AudioMessage* temp = audiomessage_;
-  audiomessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000080u;
+  ::proto::AudioMessage* temp = _impl_.audiomessage_;
+  _impl_.audiomessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -44854,18 +46965,18 @@ inline ::proto::AudioMessage* Message::release_audiomessage() {
 }
 inline ::proto::AudioMessage* Message::unsafe_arena_release_audiomessage() {
   // @@protoc_insertion_point(field_release:proto.Message.audioMessage)
-  _has_bits_[0] &= ~0x00000080u;
-  ::proto::AudioMessage* temp = audiomessage_;
-  audiomessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000080u;
+  ::proto::AudioMessage* temp = _impl_.audiomessage_;
+  _impl_.audiomessage_ = nullptr;
   return temp;
 }
 inline ::proto::AudioMessage* Message::_internal_mutable_audiomessage() {
-  _has_bits_[0] |= 0x00000080u;
-  if (audiomessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000080u;
+  if (_impl_.audiomessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::AudioMessage>(GetArenaForAllocation());
-    audiomessage_ = p;
+    _impl_.audiomessage_ = p;
   }
-  return audiomessage_;
+  return _impl_.audiomessage_;
 }
 inline ::proto::AudioMessage* Message::mutable_audiomessage() {
   ::proto::AudioMessage* _msg = _internal_mutable_audiomessage();
@@ -44875,38 +46986,38 @@ inline ::proto::AudioMessage* Message::mutable_audiomessage() {
 inline void Message::set_allocated_audiomessage(::proto::AudioMessage* audiomessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete audiomessage_;
+    delete _impl_.audiomessage_;
   }
   if (audiomessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::AudioMessage>::GetOwningArena(audiomessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(audiomessage);
     if (message_arena != submessage_arena) {
       audiomessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, audiomessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000080u;
+    _impl_._has_bits_[0] |= 0x00000080u;
   } else {
-    _has_bits_[0] &= ~0x00000080u;
+    _impl_._has_bits_[0] &= ~0x00000080u;
   }
-  audiomessage_ = audiomessage;
+  _impl_.audiomessage_ = audiomessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.audioMessage)
 }
 
 // optional .proto.VideoMessage videoMessage = 9;
 inline bool Message::_internal_has_videomessage() const {
-  bool value = (_has_bits_[0] & 0x00000100u) != 0;
-  PROTOBUF_ASSUME(!value || videomessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000100u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.videomessage_ != nullptr);
   return value;
 }
 inline bool Message::has_videomessage() const {
   return _internal_has_videomessage();
 }
 inline void Message::clear_videomessage() {
-  if (videomessage_ != nullptr) videomessage_->Clear();
-  _has_bits_[0] &= ~0x00000100u;
+  if (_impl_.videomessage_ != nullptr) _impl_.videomessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000100u;
 }
 inline const ::proto::VideoMessage& Message::_internal_videomessage() const {
-  const ::proto::VideoMessage* p = videomessage_;
+  const ::proto::VideoMessage* p = _impl_.videomessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::VideoMessage&>(
       ::proto::_VideoMessage_default_instance_);
 }
@@ -44917,20 +47028,20 @@ inline const ::proto::VideoMessage& Message::videomessage() const {
 inline void Message::unsafe_arena_set_allocated_videomessage(
     ::proto::VideoMessage* videomessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(videomessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.videomessage_);
   }
-  videomessage_ = videomessage;
+  _impl_.videomessage_ = videomessage;
   if (videomessage) {
-    _has_bits_[0] |= 0x00000100u;
+    _impl_._has_bits_[0] |= 0x00000100u;
   } else {
-    _has_bits_[0] &= ~0x00000100u;
+    _impl_._has_bits_[0] &= ~0x00000100u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.videoMessage)
 }
 inline ::proto::VideoMessage* Message::release_videomessage() {
-  _has_bits_[0] &= ~0x00000100u;
-  ::proto::VideoMessage* temp = videomessage_;
-  videomessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000100u;
+  ::proto::VideoMessage* temp = _impl_.videomessage_;
+  _impl_.videomessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -44944,18 +47055,18 @@ inline ::proto::VideoMessage* Message::release_videomessage() {
 }
 inline ::proto::VideoMessage* Message::unsafe_arena_release_videomessage() {
   // @@protoc_insertion_point(field_release:proto.Message.videoMessage)
-  _has_bits_[0] &= ~0x00000100u;
-  ::proto::VideoMessage* temp = videomessage_;
-  videomessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000100u;
+  ::proto::VideoMessage* temp = _impl_.videomessage_;
+  _impl_.videomessage_ = nullptr;
   return temp;
 }
 inline ::proto::VideoMessage* Message::_internal_mutable_videomessage() {
-  _has_bits_[0] |= 0x00000100u;
-  if (videomessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000100u;
+  if (_impl_.videomessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::VideoMessage>(GetArenaForAllocation());
-    videomessage_ = p;
+    _impl_.videomessage_ = p;
   }
-  return videomessage_;
+  return _impl_.videomessage_;
 }
 inline ::proto::VideoMessage* Message::mutable_videomessage() {
   ::proto::VideoMessage* _msg = _internal_mutable_videomessage();
@@ -44965,38 +47076,38 @@ inline ::proto::VideoMessage* Message::mutable_videomessage() {
 inline void Message::set_allocated_videomessage(::proto::VideoMessage* videomessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete videomessage_;
+    delete _impl_.videomessage_;
   }
   if (videomessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::VideoMessage>::GetOwningArena(videomessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(videomessage);
     if (message_arena != submessage_arena) {
       videomessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, videomessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000100u;
+    _impl_._has_bits_[0] |= 0x00000100u;
   } else {
-    _has_bits_[0] &= ~0x00000100u;
+    _impl_._has_bits_[0] &= ~0x00000100u;
   }
-  videomessage_ = videomessage;
+  _impl_.videomessage_ = videomessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.videoMessage)
 }
 
 // optional .proto.Call call = 10;
 inline bool Message::_internal_has_call() const {
-  bool value = (_has_bits_[0] & 0x00000200u) != 0;
-  PROTOBUF_ASSUME(!value || call_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000200u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.call_ != nullptr);
   return value;
 }
 inline bool Message::has_call() const {
   return _internal_has_call();
 }
 inline void Message::clear_call() {
-  if (call_ != nullptr) call_->Clear();
-  _has_bits_[0] &= ~0x00000200u;
+  if (_impl_.call_ != nullptr) _impl_.call_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000200u;
 }
 inline const ::proto::Call& Message::_internal_call() const {
-  const ::proto::Call* p = call_;
+  const ::proto::Call* p = _impl_.call_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::Call&>(
       ::proto::_Call_default_instance_);
 }
@@ -45007,20 +47118,20 @@ inline const ::proto::Call& Message::call() const {
 inline void Message::unsafe_arena_set_allocated_call(
     ::proto::Call* call) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(call_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.call_);
   }
-  call_ = call;
+  _impl_.call_ = call;
   if (call) {
-    _has_bits_[0] |= 0x00000200u;
+    _impl_._has_bits_[0] |= 0x00000200u;
   } else {
-    _has_bits_[0] &= ~0x00000200u;
+    _impl_._has_bits_[0] &= ~0x00000200u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.call)
 }
 inline ::proto::Call* Message::release_call() {
-  _has_bits_[0] &= ~0x00000200u;
-  ::proto::Call* temp = call_;
-  call_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000200u;
+  ::proto::Call* temp = _impl_.call_;
+  _impl_.call_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -45034,18 +47145,18 @@ inline ::proto::Call* Message::release_call() {
 }
 inline ::proto::Call* Message::unsafe_arena_release_call() {
   // @@protoc_insertion_point(field_release:proto.Message.call)
-  _has_bits_[0] &= ~0x00000200u;
-  ::proto::Call* temp = call_;
-  call_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000200u;
+  ::proto::Call* temp = _impl_.call_;
+  _impl_.call_ = nullptr;
   return temp;
 }
 inline ::proto::Call* Message::_internal_mutable_call() {
-  _has_bits_[0] |= 0x00000200u;
-  if (call_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000200u;
+  if (_impl_.call_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::Call>(GetArenaForAllocation());
-    call_ = p;
+    _impl_.call_ = p;
   }
-  return call_;
+  return _impl_.call_;
 }
 inline ::proto::Call* Message::mutable_call() {
   ::proto::Call* _msg = _internal_mutable_call();
@@ -45055,38 +47166,38 @@ inline ::proto::Call* Message::mutable_call() {
 inline void Message::set_allocated_call(::proto::Call* call) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete call_;
+    delete _impl_.call_;
   }
   if (call) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::Call>::GetOwningArena(call);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(call);
     if (message_arena != submessage_arena) {
       call = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, call, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000200u;
+    _impl_._has_bits_[0] |= 0x00000200u;
   } else {
-    _has_bits_[0] &= ~0x00000200u;
+    _impl_._has_bits_[0] &= ~0x00000200u;
   }
-  call_ = call;
+  _impl_.call_ = call;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.call)
 }
 
 // optional .proto.Chat chat = 11;
 inline bool Message::_internal_has_chat() const {
-  bool value = (_has_bits_[0] & 0x00000400u) != 0;
-  PROTOBUF_ASSUME(!value || chat_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000400u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.chat_ != nullptr);
   return value;
 }
 inline bool Message::has_chat() const {
   return _internal_has_chat();
 }
 inline void Message::clear_chat() {
-  if (chat_ != nullptr) chat_->Clear();
-  _has_bits_[0] &= ~0x00000400u;
+  if (_impl_.chat_ != nullptr) _impl_.chat_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000400u;
 }
 inline const ::proto::Chat& Message::_internal_chat() const {
-  const ::proto::Chat* p = chat_;
+  const ::proto::Chat* p = _impl_.chat_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::Chat&>(
       ::proto::_Chat_default_instance_);
 }
@@ -45097,20 +47208,20 @@ inline const ::proto::Chat& Message::chat() const {
 inline void Message::unsafe_arena_set_allocated_chat(
     ::proto::Chat* chat) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(chat_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.chat_);
   }
-  chat_ = chat;
+  _impl_.chat_ = chat;
   if (chat) {
-    _has_bits_[0] |= 0x00000400u;
+    _impl_._has_bits_[0] |= 0x00000400u;
   } else {
-    _has_bits_[0] &= ~0x00000400u;
+    _impl_._has_bits_[0] &= ~0x00000400u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.chat)
 }
 inline ::proto::Chat* Message::release_chat() {
-  _has_bits_[0] &= ~0x00000400u;
-  ::proto::Chat* temp = chat_;
-  chat_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000400u;
+  ::proto::Chat* temp = _impl_.chat_;
+  _impl_.chat_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -45124,18 +47235,18 @@ inline ::proto::Chat* Message::release_chat() {
 }
 inline ::proto::Chat* Message::unsafe_arena_release_chat() {
   // @@protoc_insertion_point(field_release:proto.Message.chat)
-  _has_bits_[0] &= ~0x00000400u;
-  ::proto::Chat* temp = chat_;
-  chat_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000400u;
+  ::proto::Chat* temp = _impl_.chat_;
+  _impl_.chat_ = nullptr;
   return temp;
 }
 inline ::proto::Chat* Message::_internal_mutable_chat() {
-  _has_bits_[0] |= 0x00000400u;
-  if (chat_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000400u;
+  if (_impl_.chat_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::Chat>(GetArenaForAllocation());
-    chat_ = p;
+    _impl_.chat_ = p;
   }
-  return chat_;
+  return _impl_.chat_;
 }
 inline ::proto::Chat* Message::mutable_chat() {
   ::proto::Chat* _msg = _internal_mutable_chat();
@@ -45145,38 +47256,38 @@ inline ::proto::Chat* Message::mutable_chat() {
 inline void Message::set_allocated_chat(::proto::Chat* chat) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete chat_;
+    delete _impl_.chat_;
   }
   if (chat) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::Chat>::GetOwningArena(chat);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(chat);
     if (message_arena != submessage_arena) {
       chat = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, chat, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000400u;
+    _impl_._has_bits_[0] |= 0x00000400u;
   } else {
-    _has_bits_[0] &= ~0x00000400u;
+    _impl_._has_bits_[0] &= ~0x00000400u;
   }
-  chat_ = chat;
+  _impl_.chat_ = chat;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.chat)
 }
 
 // optional .proto.ProtocolMessage protocolMessage = 12;
 inline bool Message::_internal_has_protocolmessage() const {
-  bool value = (_has_bits_[0] & 0x00000800u) != 0;
-  PROTOBUF_ASSUME(!value || protocolmessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000800u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.protocolmessage_ != nullptr);
   return value;
 }
 inline bool Message::has_protocolmessage() const {
   return _internal_has_protocolmessage();
 }
 inline void Message::clear_protocolmessage() {
-  if (protocolmessage_ != nullptr) protocolmessage_->Clear();
-  _has_bits_[0] &= ~0x00000800u;
+  if (_impl_.protocolmessage_ != nullptr) _impl_.protocolmessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000800u;
 }
 inline const ::proto::ProtocolMessage& Message::_internal_protocolmessage() const {
-  const ::proto::ProtocolMessage* p = protocolmessage_;
+  const ::proto::ProtocolMessage* p = _impl_.protocolmessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ProtocolMessage&>(
       ::proto::_ProtocolMessage_default_instance_);
 }
@@ -45187,20 +47298,20 @@ inline const ::proto::ProtocolMessage& Message::protocolmessage() const {
 inline void Message::unsafe_arena_set_allocated_protocolmessage(
     ::proto::ProtocolMessage* protocolmessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(protocolmessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.protocolmessage_);
   }
-  protocolmessage_ = protocolmessage;
+  _impl_.protocolmessage_ = protocolmessage;
   if (protocolmessage) {
-    _has_bits_[0] |= 0x00000800u;
+    _impl_._has_bits_[0] |= 0x00000800u;
   } else {
-    _has_bits_[0] &= ~0x00000800u;
+    _impl_._has_bits_[0] &= ~0x00000800u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.protocolMessage)
 }
 inline ::proto::ProtocolMessage* Message::release_protocolmessage() {
-  _has_bits_[0] &= ~0x00000800u;
-  ::proto::ProtocolMessage* temp = protocolmessage_;
-  protocolmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000800u;
+  ::proto::ProtocolMessage* temp = _impl_.protocolmessage_;
+  _impl_.protocolmessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -45214,18 +47325,18 @@ inline ::proto::ProtocolMessage* Message::release_protocolmessage() {
 }
 inline ::proto::ProtocolMessage* Message::unsafe_arena_release_protocolmessage() {
   // @@protoc_insertion_point(field_release:proto.Message.protocolMessage)
-  _has_bits_[0] &= ~0x00000800u;
-  ::proto::ProtocolMessage* temp = protocolmessage_;
-  protocolmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000800u;
+  ::proto::ProtocolMessage* temp = _impl_.protocolmessage_;
+  _impl_.protocolmessage_ = nullptr;
   return temp;
 }
 inline ::proto::ProtocolMessage* Message::_internal_mutable_protocolmessage() {
-  _has_bits_[0] |= 0x00000800u;
-  if (protocolmessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000800u;
+  if (_impl_.protocolmessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ProtocolMessage>(GetArenaForAllocation());
-    protocolmessage_ = p;
+    _impl_.protocolmessage_ = p;
   }
-  return protocolmessage_;
+  return _impl_.protocolmessage_;
 }
 inline ::proto::ProtocolMessage* Message::mutable_protocolmessage() {
   ::proto::ProtocolMessage* _msg = _internal_mutable_protocolmessage();
@@ -45235,38 +47346,38 @@ inline ::proto::ProtocolMessage* Message::mutable_protocolmessage() {
 inline void Message::set_allocated_protocolmessage(::proto::ProtocolMessage* protocolmessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete protocolmessage_;
+    delete _impl_.protocolmessage_;
   }
   if (protocolmessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ProtocolMessage>::GetOwningArena(protocolmessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(protocolmessage);
     if (message_arena != submessage_arena) {
       protocolmessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, protocolmessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000800u;
+    _impl_._has_bits_[0] |= 0x00000800u;
   } else {
-    _has_bits_[0] &= ~0x00000800u;
+    _impl_._has_bits_[0] &= ~0x00000800u;
   }
-  protocolmessage_ = protocolmessage;
+  _impl_.protocolmessage_ = protocolmessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.protocolMessage)
 }
 
 // optional .proto.ContactsArrayMessage contactsArrayMessage = 13;
 inline bool Message::_internal_has_contactsarraymessage() const {
-  bool value = (_has_bits_[0] & 0x00001000u) != 0;
-  PROTOBUF_ASSUME(!value || contactsarraymessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00001000u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.contactsarraymessage_ != nullptr);
   return value;
 }
 inline bool Message::has_contactsarraymessage() const {
   return _internal_has_contactsarraymessage();
 }
 inline void Message::clear_contactsarraymessage() {
-  if (contactsarraymessage_ != nullptr) contactsarraymessage_->Clear();
-  _has_bits_[0] &= ~0x00001000u;
+  if (_impl_.contactsarraymessage_ != nullptr) _impl_.contactsarraymessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x00001000u;
 }
 inline const ::proto::ContactsArrayMessage& Message::_internal_contactsarraymessage() const {
-  const ::proto::ContactsArrayMessage* p = contactsarraymessage_;
+  const ::proto::ContactsArrayMessage* p = _impl_.contactsarraymessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ContactsArrayMessage&>(
       ::proto::_ContactsArrayMessage_default_instance_);
 }
@@ -45277,20 +47388,20 @@ inline const ::proto::ContactsArrayMessage& Message::contactsarraymessage() cons
 inline void Message::unsafe_arena_set_allocated_contactsarraymessage(
     ::proto::ContactsArrayMessage* contactsarraymessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(contactsarraymessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.contactsarraymessage_);
   }
-  contactsarraymessage_ = contactsarraymessage;
+  _impl_.contactsarraymessage_ = contactsarraymessage;
   if (contactsarraymessage) {
-    _has_bits_[0] |= 0x00001000u;
+    _impl_._has_bits_[0] |= 0x00001000u;
   } else {
-    _has_bits_[0] &= ~0x00001000u;
+    _impl_._has_bits_[0] &= ~0x00001000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.contactsArrayMessage)
 }
 inline ::proto::ContactsArrayMessage* Message::release_contactsarraymessage() {
-  _has_bits_[0] &= ~0x00001000u;
-  ::proto::ContactsArrayMessage* temp = contactsarraymessage_;
-  contactsarraymessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00001000u;
+  ::proto::ContactsArrayMessage* temp = _impl_.contactsarraymessage_;
+  _impl_.contactsarraymessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -45304,18 +47415,18 @@ inline ::proto::ContactsArrayMessage* Message::release_contactsarraymessage() {
 }
 inline ::proto::ContactsArrayMessage* Message::unsafe_arena_release_contactsarraymessage() {
   // @@protoc_insertion_point(field_release:proto.Message.contactsArrayMessage)
-  _has_bits_[0] &= ~0x00001000u;
-  ::proto::ContactsArrayMessage* temp = contactsarraymessage_;
-  contactsarraymessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00001000u;
+  ::proto::ContactsArrayMessage* temp = _impl_.contactsarraymessage_;
+  _impl_.contactsarraymessage_ = nullptr;
   return temp;
 }
 inline ::proto::ContactsArrayMessage* Message::_internal_mutable_contactsarraymessage() {
-  _has_bits_[0] |= 0x00001000u;
-  if (contactsarraymessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00001000u;
+  if (_impl_.contactsarraymessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ContactsArrayMessage>(GetArenaForAllocation());
-    contactsarraymessage_ = p;
+    _impl_.contactsarraymessage_ = p;
   }
-  return contactsarraymessage_;
+  return _impl_.contactsarraymessage_;
 }
 inline ::proto::ContactsArrayMessage* Message::mutable_contactsarraymessage() {
   ::proto::ContactsArrayMessage* _msg = _internal_mutable_contactsarraymessage();
@@ -45325,38 +47436,38 @@ inline ::proto::ContactsArrayMessage* Message::mutable_contactsarraymessage() {
 inline void Message::set_allocated_contactsarraymessage(::proto::ContactsArrayMessage* contactsarraymessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete contactsarraymessage_;
+    delete _impl_.contactsarraymessage_;
   }
   if (contactsarraymessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ContactsArrayMessage>::GetOwningArena(contactsarraymessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(contactsarraymessage);
     if (message_arena != submessage_arena) {
       contactsarraymessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, contactsarraymessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x00001000u;
+    _impl_._has_bits_[0] |= 0x00001000u;
   } else {
-    _has_bits_[0] &= ~0x00001000u;
+    _impl_._has_bits_[0] &= ~0x00001000u;
   }
-  contactsarraymessage_ = contactsarraymessage;
+  _impl_.contactsarraymessage_ = contactsarraymessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.contactsArrayMessage)
 }
 
 // optional .proto.HighlyStructuredMessage highlyStructuredMessage = 14;
 inline bool Message::_internal_has_highlystructuredmessage() const {
-  bool value = (_has_bits_[0] & 0x00002000u) != 0;
-  PROTOBUF_ASSUME(!value || highlystructuredmessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00002000u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.highlystructuredmessage_ != nullptr);
   return value;
 }
 inline bool Message::has_highlystructuredmessage() const {
   return _internal_has_highlystructuredmessage();
 }
 inline void Message::clear_highlystructuredmessage() {
-  if (highlystructuredmessage_ != nullptr) highlystructuredmessage_->Clear();
-  _has_bits_[0] &= ~0x00002000u;
+  if (_impl_.highlystructuredmessage_ != nullptr) _impl_.highlystructuredmessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x00002000u;
 }
 inline const ::proto::HighlyStructuredMessage& Message::_internal_highlystructuredmessage() const {
-  const ::proto::HighlyStructuredMessage* p = highlystructuredmessage_;
+  const ::proto::HighlyStructuredMessage* p = _impl_.highlystructuredmessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::HighlyStructuredMessage&>(
       ::proto::_HighlyStructuredMessage_default_instance_);
 }
@@ -45367,20 +47478,20 @@ inline const ::proto::HighlyStructuredMessage& Message::highlystructuredmessage(
 inline void Message::unsafe_arena_set_allocated_highlystructuredmessage(
     ::proto::HighlyStructuredMessage* highlystructuredmessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(highlystructuredmessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.highlystructuredmessage_);
   }
-  highlystructuredmessage_ = highlystructuredmessage;
+  _impl_.highlystructuredmessage_ = highlystructuredmessage;
   if (highlystructuredmessage) {
-    _has_bits_[0] |= 0x00002000u;
+    _impl_._has_bits_[0] |= 0x00002000u;
   } else {
-    _has_bits_[0] &= ~0x00002000u;
+    _impl_._has_bits_[0] &= ~0x00002000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.highlyStructuredMessage)
 }
 inline ::proto::HighlyStructuredMessage* Message::release_highlystructuredmessage() {
-  _has_bits_[0] &= ~0x00002000u;
-  ::proto::HighlyStructuredMessage* temp = highlystructuredmessage_;
-  highlystructuredmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00002000u;
+  ::proto::HighlyStructuredMessage* temp = _impl_.highlystructuredmessage_;
+  _impl_.highlystructuredmessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -45394,18 +47505,18 @@ inline ::proto::HighlyStructuredMessage* Message::release_highlystructuredmessag
 }
 inline ::proto::HighlyStructuredMessage* Message::unsafe_arena_release_highlystructuredmessage() {
   // @@protoc_insertion_point(field_release:proto.Message.highlyStructuredMessage)
-  _has_bits_[0] &= ~0x00002000u;
-  ::proto::HighlyStructuredMessage* temp = highlystructuredmessage_;
-  highlystructuredmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00002000u;
+  ::proto::HighlyStructuredMessage* temp = _impl_.highlystructuredmessage_;
+  _impl_.highlystructuredmessage_ = nullptr;
   return temp;
 }
 inline ::proto::HighlyStructuredMessage* Message::_internal_mutable_highlystructuredmessage() {
-  _has_bits_[0] |= 0x00002000u;
-  if (highlystructuredmessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00002000u;
+  if (_impl_.highlystructuredmessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::HighlyStructuredMessage>(GetArenaForAllocation());
-    highlystructuredmessage_ = p;
+    _impl_.highlystructuredmessage_ = p;
   }
-  return highlystructuredmessage_;
+  return _impl_.highlystructuredmessage_;
 }
 inline ::proto::HighlyStructuredMessage* Message::mutable_highlystructuredmessage() {
   ::proto::HighlyStructuredMessage* _msg = _internal_mutable_highlystructuredmessage();
@@ -45415,38 +47526,38 @@ inline ::proto::HighlyStructuredMessage* Message::mutable_highlystructuredmessag
 inline void Message::set_allocated_highlystructuredmessage(::proto::HighlyStructuredMessage* highlystructuredmessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete highlystructuredmessage_;
+    delete _impl_.highlystructuredmessage_;
   }
   if (highlystructuredmessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::HighlyStructuredMessage>::GetOwningArena(highlystructuredmessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(highlystructuredmessage);
     if (message_arena != submessage_arena) {
       highlystructuredmessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, highlystructuredmessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x00002000u;
+    _impl_._has_bits_[0] |= 0x00002000u;
   } else {
-    _has_bits_[0] &= ~0x00002000u;
+    _impl_._has_bits_[0] &= ~0x00002000u;
   }
-  highlystructuredmessage_ = highlystructuredmessage;
+  _impl_.highlystructuredmessage_ = highlystructuredmessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.highlyStructuredMessage)
 }
 
 // optional .proto.SenderKeyDistributionMessage fastRatchetKeySenderKeyDistributionMessage = 15;
 inline bool Message::_internal_has_fastratchetkeysenderkeydistributionmessage() const {
-  bool value = (_has_bits_[0] & 0x00004000u) != 0;
-  PROTOBUF_ASSUME(!value || fastratchetkeysenderkeydistributionmessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00004000u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.fastratchetkeysenderkeydistributionmessage_ != nullptr);
   return value;
 }
 inline bool Message::has_fastratchetkeysenderkeydistributionmessage() const {
   return _internal_has_fastratchetkeysenderkeydistributionmessage();
 }
 inline void Message::clear_fastratchetkeysenderkeydistributionmessage() {
-  if (fastratchetkeysenderkeydistributionmessage_ != nullptr) fastratchetkeysenderkeydistributionmessage_->Clear();
-  _has_bits_[0] &= ~0x00004000u;
+  if (_impl_.fastratchetkeysenderkeydistributionmessage_ != nullptr) _impl_.fastratchetkeysenderkeydistributionmessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x00004000u;
 }
 inline const ::proto::SenderKeyDistributionMessage& Message::_internal_fastratchetkeysenderkeydistributionmessage() const {
-  const ::proto::SenderKeyDistributionMessage* p = fastratchetkeysenderkeydistributionmessage_;
+  const ::proto::SenderKeyDistributionMessage* p = _impl_.fastratchetkeysenderkeydistributionmessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::SenderKeyDistributionMessage&>(
       ::proto::_SenderKeyDistributionMessage_default_instance_);
 }
@@ -45457,20 +47568,20 @@ inline const ::proto::SenderKeyDistributionMessage& Message::fastratchetkeysende
 inline void Message::unsafe_arena_set_allocated_fastratchetkeysenderkeydistributionmessage(
     ::proto::SenderKeyDistributionMessage* fastratchetkeysenderkeydistributionmessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(fastratchetkeysenderkeydistributionmessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.fastratchetkeysenderkeydistributionmessage_);
   }
-  fastratchetkeysenderkeydistributionmessage_ = fastratchetkeysenderkeydistributionmessage;
+  _impl_.fastratchetkeysenderkeydistributionmessage_ = fastratchetkeysenderkeydistributionmessage;
   if (fastratchetkeysenderkeydistributionmessage) {
-    _has_bits_[0] |= 0x00004000u;
+    _impl_._has_bits_[0] |= 0x00004000u;
   } else {
-    _has_bits_[0] &= ~0x00004000u;
+    _impl_._has_bits_[0] &= ~0x00004000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.fastRatchetKeySenderKeyDistributionMessage)
 }
 inline ::proto::SenderKeyDistributionMessage* Message::release_fastratchetkeysenderkeydistributionmessage() {
-  _has_bits_[0] &= ~0x00004000u;
-  ::proto::SenderKeyDistributionMessage* temp = fastratchetkeysenderkeydistributionmessage_;
-  fastratchetkeysenderkeydistributionmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00004000u;
+  ::proto::SenderKeyDistributionMessage* temp = _impl_.fastratchetkeysenderkeydistributionmessage_;
+  _impl_.fastratchetkeysenderkeydistributionmessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -45484,18 +47595,18 @@ inline ::proto::SenderKeyDistributionMessage* Message::release_fastratchetkeysen
 }
 inline ::proto::SenderKeyDistributionMessage* Message::unsafe_arena_release_fastratchetkeysenderkeydistributionmessage() {
   // @@protoc_insertion_point(field_release:proto.Message.fastRatchetKeySenderKeyDistributionMessage)
-  _has_bits_[0] &= ~0x00004000u;
-  ::proto::SenderKeyDistributionMessage* temp = fastratchetkeysenderkeydistributionmessage_;
-  fastratchetkeysenderkeydistributionmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00004000u;
+  ::proto::SenderKeyDistributionMessage* temp = _impl_.fastratchetkeysenderkeydistributionmessage_;
+  _impl_.fastratchetkeysenderkeydistributionmessage_ = nullptr;
   return temp;
 }
 inline ::proto::SenderKeyDistributionMessage* Message::_internal_mutable_fastratchetkeysenderkeydistributionmessage() {
-  _has_bits_[0] |= 0x00004000u;
-  if (fastratchetkeysenderkeydistributionmessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00004000u;
+  if (_impl_.fastratchetkeysenderkeydistributionmessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::SenderKeyDistributionMessage>(GetArenaForAllocation());
-    fastratchetkeysenderkeydistributionmessage_ = p;
+    _impl_.fastratchetkeysenderkeydistributionmessage_ = p;
   }
-  return fastratchetkeysenderkeydistributionmessage_;
+  return _impl_.fastratchetkeysenderkeydistributionmessage_;
 }
 inline ::proto::SenderKeyDistributionMessage* Message::mutable_fastratchetkeysenderkeydistributionmessage() {
   ::proto::SenderKeyDistributionMessage* _msg = _internal_mutable_fastratchetkeysenderkeydistributionmessage();
@@ -45505,38 +47616,38 @@ inline ::proto::SenderKeyDistributionMessage* Message::mutable_fastratchetkeysen
 inline void Message::set_allocated_fastratchetkeysenderkeydistributionmessage(::proto::SenderKeyDistributionMessage* fastratchetkeysenderkeydistributionmessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete fastratchetkeysenderkeydistributionmessage_;
+    delete _impl_.fastratchetkeysenderkeydistributionmessage_;
   }
   if (fastratchetkeysenderkeydistributionmessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::SenderKeyDistributionMessage>::GetOwningArena(fastratchetkeysenderkeydistributionmessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(fastratchetkeysenderkeydistributionmessage);
     if (message_arena != submessage_arena) {
       fastratchetkeysenderkeydistributionmessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, fastratchetkeysenderkeydistributionmessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x00004000u;
+    _impl_._has_bits_[0] |= 0x00004000u;
   } else {
-    _has_bits_[0] &= ~0x00004000u;
+    _impl_._has_bits_[0] &= ~0x00004000u;
   }
-  fastratchetkeysenderkeydistributionmessage_ = fastratchetkeysenderkeydistributionmessage;
+  _impl_.fastratchetkeysenderkeydistributionmessage_ = fastratchetkeysenderkeydistributionmessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.fastRatchetKeySenderKeyDistributionMessage)
 }
 
 // optional .proto.SendPaymentMessage sendPaymentMessage = 16;
 inline bool Message::_internal_has_sendpaymentmessage() const {
-  bool value = (_has_bits_[0] & 0x00008000u) != 0;
-  PROTOBUF_ASSUME(!value || sendpaymentmessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00008000u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.sendpaymentmessage_ != nullptr);
   return value;
 }
 inline bool Message::has_sendpaymentmessage() const {
   return _internal_has_sendpaymentmessage();
 }
 inline void Message::clear_sendpaymentmessage() {
-  if (sendpaymentmessage_ != nullptr) sendpaymentmessage_->Clear();
-  _has_bits_[0] &= ~0x00008000u;
+  if (_impl_.sendpaymentmessage_ != nullptr) _impl_.sendpaymentmessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x00008000u;
 }
 inline const ::proto::SendPaymentMessage& Message::_internal_sendpaymentmessage() const {
-  const ::proto::SendPaymentMessage* p = sendpaymentmessage_;
+  const ::proto::SendPaymentMessage* p = _impl_.sendpaymentmessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::SendPaymentMessage&>(
       ::proto::_SendPaymentMessage_default_instance_);
 }
@@ -45547,20 +47658,20 @@ inline const ::proto::SendPaymentMessage& Message::sendpaymentmessage() const {
 inline void Message::unsafe_arena_set_allocated_sendpaymentmessage(
     ::proto::SendPaymentMessage* sendpaymentmessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(sendpaymentmessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.sendpaymentmessage_);
   }
-  sendpaymentmessage_ = sendpaymentmessage;
+  _impl_.sendpaymentmessage_ = sendpaymentmessage;
   if (sendpaymentmessage) {
-    _has_bits_[0] |= 0x00008000u;
+    _impl_._has_bits_[0] |= 0x00008000u;
   } else {
-    _has_bits_[0] &= ~0x00008000u;
+    _impl_._has_bits_[0] &= ~0x00008000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.sendPaymentMessage)
 }
 inline ::proto::SendPaymentMessage* Message::release_sendpaymentmessage() {
-  _has_bits_[0] &= ~0x00008000u;
-  ::proto::SendPaymentMessage* temp = sendpaymentmessage_;
-  sendpaymentmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00008000u;
+  ::proto::SendPaymentMessage* temp = _impl_.sendpaymentmessage_;
+  _impl_.sendpaymentmessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -45574,18 +47685,18 @@ inline ::proto::SendPaymentMessage* Message::release_sendpaymentmessage() {
 }
 inline ::proto::SendPaymentMessage* Message::unsafe_arena_release_sendpaymentmessage() {
   // @@protoc_insertion_point(field_release:proto.Message.sendPaymentMessage)
-  _has_bits_[0] &= ~0x00008000u;
-  ::proto::SendPaymentMessage* temp = sendpaymentmessage_;
-  sendpaymentmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00008000u;
+  ::proto::SendPaymentMessage* temp = _impl_.sendpaymentmessage_;
+  _impl_.sendpaymentmessage_ = nullptr;
   return temp;
 }
 inline ::proto::SendPaymentMessage* Message::_internal_mutable_sendpaymentmessage() {
-  _has_bits_[0] |= 0x00008000u;
-  if (sendpaymentmessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00008000u;
+  if (_impl_.sendpaymentmessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::SendPaymentMessage>(GetArenaForAllocation());
-    sendpaymentmessage_ = p;
+    _impl_.sendpaymentmessage_ = p;
   }
-  return sendpaymentmessage_;
+  return _impl_.sendpaymentmessage_;
 }
 inline ::proto::SendPaymentMessage* Message::mutable_sendpaymentmessage() {
   ::proto::SendPaymentMessage* _msg = _internal_mutable_sendpaymentmessage();
@@ -45595,38 +47706,38 @@ inline ::proto::SendPaymentMessage* Message::mutable_sendpaymentmessage() {
 inline void Message::set_allocated_sendpaymentmessage(::proto::SendPaymentMessage* sendpaymentmessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete sendpaymentmessage_;
+    delete _impl_.sendpaymentmessage_;
   }
   if (sendpaymentmessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::SendPaymentMessage>::GetOwningArena(sendpaymentmessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(sendpaymentmessage);
     if (message_arena != submessage_arena) {
       sendpaymentmessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, sendpaymentmessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x00008000u;
+    _impl_._has_bits_[0] |= 0x00008000u;
   } else {
-    _has_bits_[0] &= ~0x00008000u;
+    _impl_._has_bits_[0] &= ~0x00008000u;
   }
-  sendpaymentmessage_ = sendpaymentmessage;
+  _impl_.sendpaymentmessage_ = sendpaymentmessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.sendPaymentMessage)
 }
 
 // optional .proto.LiveLocationMessage liveLocationMessage = 18;
 inline bool Message::_internal_has_livelocationmessage() const {
-  bool value = (_has_bits_[0] & 0x00010000u) != 0;
-  PROTOBUF_ASSUME(!value || livelocationmessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00010000u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.livelocationmessage_ != nullptr);
   return value;
 }
 inline bool Message::has_livelocationmessage() const {
   return _internal_has_livelocationmessage();
 }
 inline void Message::clear_livelocationmessage() {
-  if (livelocationmessage_ != nullptr) livelocationmessage_->Clear();
-  _has_bits_[0] &= ~0x00010000u;
+  if (_impl_.livelocationmessage_ != nullptr) _impl_.livelocationmessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x00010000u;
 }
 inline const ::proto::LiveLocationMessage& Message::_internal_livelocationmessage() const {
-  const ::proto::LiveLocationMessage* p = livelocationmessage_;
+  const ::proto::LiveLocationMessage* p = _impl_.livelocationmessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::LiveLocationMessage&>(
       ::proto::_LiveLocationMessage_default_instance_);
 }
@@ -45637,20 +47748,20 @@ inline const ::proto::LiveLocationMessage& Message::livelocationmessage() const
 inline void Message::unsafe_arena_set_allocated_livelocationmessage(
     ::proto::LiveLocationMessage* livelocationmessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(livelocationmessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.livelocationmessage_);
   }
-  livelocationmessage_ = livelocationmessage;
+  _impl_.livelocationmessage_ = livelocationmessage;
   if (livelocationmessage) {
-    _has_bits_[0] |= 0x00010000u;
+    _impl_._has_bits_[0] |= 0x00010000u;
   } else {
-    _has_bits_[0] &= ~0x00010000u;
+    _impl_._has_bits_[0] &= ~0x00010000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.liveLocationMessage)
 }
 inline ::proto::LiveLocationMessage* Message::release_livelocationmessage() {
-  _has_bits_[0] &= ~0x00010000u;
-  ::proto::LiveLocationMessage* temp = livelocationmessage_;
-  livelocationmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00010000u;
+  ::proto::LiveLocationMessage* temp = _impl_.livelocationmessage_;
+  _impl_.livelocationmessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -45664,18 +47775,18 @@ inline ::proto::LiveLocationMessage* Message::release_livelocationmessage() {
 }
 inline ::proto::LiveLocationMessage* Message::unsafe_arena_release_livelocationmessage() {
   // @@protoc_insertion_point(field_release:proto.Message.liveLocationMessage)
-  _has_bits_[0] &= ~0x00010000u;
-  ::proto::LiveLocationMessage* temp = livelocationmessage_;
-  livelocationmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00010000u;
+  ::proto::LiveLocationMessage* temp = _impl_.livelocationmessage_;
+  _impl_.livelocationmessage_ = nullptr;
   return temp;
 }
 inline ::proto::LiveLocationMessage* Message::_internal_mutable_livelocationmessage() {
-  _has_bits_[0] |= 0x00010000u;
-  if (livelocationmessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00010000u;
+  if (_impl_.livelocationmessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::LiveLocationMessage>(GetArenaForAllocation());
-    livelocationmessage_ = p;
+    _impl_.livelocationmessage_ = p;
   }
-  return livelocationmessage_;
+  return _impl_.livelocationmessage_;
 }
 inline ::proto::LiveLocationMessage* Message::mutable_livelocationmessage() {
   ::proto::LiveLocationMessage* _msg = _internal_mutable_livelocationmessage();
@@ -45685,38 +47796,38 @@ inline ::proto::LiveLocationMessage* Message::mutable_livelocationmessage() {
 inline void Message::set_allocated_livelocationmessage(::proto::LiveLocationMessage* livelocationmessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete livelocationmessage_;
+    delete _impl_.livelocationmessage_;
   }
   if (livelocationmessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::LiveLocationMessage>::GetOwningArena(livelocationmessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(livelocationmessage);
     if (message_arena != submessage_arena) {
       livelocationmessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, livelocationmessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x00010000u;
+    _impl_._has_bits_[0] |= 0x00010000u;
   } else {
-    _has_bits_[0] &= ~0x00010000u;
+    _impl_._has_bits_[0] &= ~0x00010000u;
   }
-  livelocationmessage_ = livelocationmessage;
+  _impl_.livelocationmessage_ = livelocationmessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.liveLocationMessage)
 }
 
 // optional .proto.RequestPaymentMessage requestPaymentMessage = 22;
 inline bool Message::_internal_has_requestpaymentmessage() const {
-  bool value = (_has_bits_[0] & 0x00020000u) != 0;
-  PROTOBUF_ASSUME(!value || requestpaymentmessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00020000u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.requestpaymentmessage_ != nullptr);
   return value;
 }
 inline bool Message::has_requestpaymentmessage() const {
   return _internal_has_requestpaymentmessage();
 }
 inline void Message::clear_requestpaymentmessage() {
-  if (requestpaymentmessage_ != nullptr) requestpaymentmessage_->Clear();
-  _has_bits_[0] &= ~0x00020000u;
+  if (_impl_.requestpaymentmessage_ != nullptr) _impl_.requestpaymentmessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x00020000u;
 }
 inline const ::proto::RequestPaymentMessage& Message::_internal_requestpaymentmessage() const {
-  const ::proto::RequestPaymentMessage* p = requestpaymentmessage_;
+  const ::proto::RequestPaymentMessage* p = _impl_.requestpaymentmessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::RequestPaymentMessage&>(
       ::proto::_RequestPaymentMessage_default_instance_);
 }
@@ -45727,20 +47838,20 @@ inline const ::proto::RequestPaymentMessage& Message::requestpaymentmessage() co
 inline void Message::unsafe_arena_set_allocated_requestpaymentmessage(
     ::proto::RequestPaymentMessage* requestpaymentmessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(requestpaymentmessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.requestpaymentmessage_);
   }
-  requestpaymentmessage_ = requestpaymentmessage;
+  _impl_.requestpaymentmessage_ = requestpaymentmessage;
   if (requestpaymentmessage) {
-    _has_bits_[0] |= 0x00020000u;
+    _impl_._has_bits_[0] |= 0x00020000u;
   } else {
-    _has_bits_[0] &= ~0x00020000u;
+    _impl_._has_bits_[0] &= ~0x00020000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.requestPaymentMessage)
 }
 inline ::proto::RequestPaymentMessage* Message::release_requestpaymentmessage() {
-  _has_bits_[0] &= ~0x00020000u;
-  ::proto::RequestPaymentMessage* temp = requestpaymentmessage_;
-  requestpaymentmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00020000u;
+  ::proto::RequestPaymentMessage* temp = _impl_.requestpaymentmessage_;
+  _impl_.requestpaymentmessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -45754,18 +47865,18 @@ inline ::proto::RequestPaymentMessage* Message::release_requestpaymentmessage()
 }
 inline ::proto::RequestPaymentMessage* Message::unsafe_arena_release_requestpaymentmessage() {
   // @@protoc_insertion_point(field_release:proto.Message.requestPaymentMessage)
-  _has_bits_[0] &= ~0x00020000u;
-  ::proto::RequestPaymentMessage* temp = requestpaymentmessage_;
-  requestpaymentmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00020000u;
+  ::proto::RequestPaymentMessage* temp = _impl_.requestpaymentmessage_;
+  _impl_.requestpaymentmessage_ = nullptr;
   return temp;
 }
 inline ::proto::RequestPaymentMessage* Message::_internal_mutable_requestpaymentmessage() {
-  _has_bits_[0] |= 0x00020000u;
-  if (requestpaymentmessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00020000u;
+  if (_impl_.requestpaymentmessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::RequestPaymentMessage>(GetArenaForAllocation());
-    requestpaymentmessage_ = p;
+    _impl_.requestpaymentmessage_ = p;
   }
-  return requestpaymentmessage_;
+  return _impl_.requestpaymentmessage_;
 }
 inline ::proto::RequestPaymentMessage* Message::mutable_requestpaymentmessage() {
   ::proto::RequestPaymentMessage* _msg = _internal_mutable_requestpaymentmessage();
@@ -45775,38 +47886,38 @@ inline ::proto::RequestPaymentMessage* Message::mutable_requestpaymentmessage()
 inline void Message::set_allocated_requestpaymentmessage(::proto::RequestPaymentMessage* requestpaymentmessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete requestpaymentmessage_;
+    delete _impl_.requestpaymentmessage_;
   }
   if (requestpaymentmessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::RequestPaymentMessage>::GetOwningArena(requestpaymentmessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(requestpaymentmessage);
     if (message_arena != submessage_arena) {
       requestpaymentmessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, requestpaymentmessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x00020000u;
+    _impl_._has_bits_[0] |= 0x00020000u;
   } else {
-    _has_bits_[0] &= ~0x00020000u;
+    _impl_._has_bits_[0] &= ~0x00020000u;
   }
-  requestpaymentmessage_ = requestpaymentmessage;
+  _impl_.requestpaymentmessage_ = requestpaymentmessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.requestPaymentMessage)
 }
 
 // optional .proto.DeclinePaymentRequestMessage declinePaymentRequestMessage = 23;
 inline bool Message::_internal_has_declinepaymentrequestmessage() const {
-  bool value = (_has_bits_[0] & 0x00040000u) != 0;
-  PROTOBUF_ASSUME(!value || declinepaymentrequestmessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00040000u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.declinepaymentrequestmessage_ != nullptr);
   return value;
 }
 inline bool Message::has_declinepaymentrequestmessage() const {
   return _internal_has_declinepaymentrequestmessage();
 }
 inline void Message::clear_declinepaymentrequestmessage() {
-  if (declinepaymentrequestmessage_ != nullptr) declinepaymentrequestmessage_->Clear();
-  _has_bits_[0] &= ~0x00040000u;
+  if (_impl_.declinepaymentrequestmessage_ != nullptr) _impl_.declinepaymentrequestmessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x00040000u;
 }
 inline const ::proto::DeclinePaymentRequestMessage& Message::_internal_declinepaymentrequestmessage() const {
-  const ::proto::DeclinePaymentRequestMessage* p = declinepaymentrequestmessage_;
+  const ::proto::DeclinePaymentRequestMessage* p = _impl_.declinepaymentrequestmessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::DeclinePaymentRequestMessage&>(
       ::proto::_DeclinePaymentRequestMessage_default_instance_);
 }
@@ -45817,20 +47928,20 @@ inline const ::proto::DeclinePaymentRequestMessage& Message::declinepaymentreque
 inline void Message::unsafe_arena_set_allocated_declinepaymentrequestmessage(
     ::proto::DeclinePaymentRequestMessage* declinepaymentrequestmessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(declinepaymentrequestmessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.declinepaymentrequestmessage_);
   }
-  declinepaymentrequestmessage_ = declinepaymentrequestmessage;
+  _impl_.declinepaymentrequestmessage_ = declinepaymentrequestmessage;
   if (declinepaymentrequestmessage) {
-    _has_bits_[0] |= 0x00040000u;
+    _impl_._has_bits_[0] |= 0x00040000u;
   } else {
-    _has_bits_[0] &= ~0x00040000u;
+    _impl_._has_bits_[0] &= ~0x00040000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.declinePaymentRequestMessage)
 }
 inline ::proto::DeclinePaymentRequestMessage* Message::release_declinepaymentrequestmessage() {
-  _has_bits_[0] &= ~0x00040000u;
-  ::proto::DeclinePaymentRequestMessage* temp = declinepaymentrequestmessage_;
-  declinepaymentrequestmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00040000u;
+  ::proto::DeclinePaymentRequestMessage* temp = _impl_.declinepaymentrequestmessage_;
+  _impl_.declinepaymentrequestmessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -45844,18 +47955,18 @@ inline ::proto::DeclinePaymentRequestMessage* Message::release_declinepaymentreq
 }
 inline ::proto::DeclinePaymentRequestMessage* Message::unsafe_arena_release_declinepaymentrequestmessage() {
   // @@protoc_insertion_point(field_release:proto.Message.declinePaymentRequestMessage)
-  _has_bits_[0] &= ~0x00040000u;
-  ::proto::DeclinePaymentRequestMessage* temp = declinepaymentrequestmessage_;
-  declinepaymentrequestmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00040000u;
+  ::proto::DeclinePaymentRequestMessage* temp = _impl_.declinepaymentrequestmessage_;
+  _impl_.declinepaymentrequestmessage_ = nullptr;
   return temp;
 }
 inline ::proto::DeclinePaymentRequestMessage* Message::_internal_mutable_declinepaymentrequestmessage() {
-  _has_bits_[0] |= 0x00040000u;
-  if (declinepaymentrequestmessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00040000u;
+  if (_impl_.declinepaymentrequestmessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::DeclinePaymentRequestMessage>(GetArenaForAllocation());
-    declinepaymentrequestmessage_ = p;
+    _impl_.declinepaymentrequestmessage_ = p;
   }
-  return declinepaymentrequestmessage_;
+  return _impl_.declinepaymentrequestmessage_;
 }
 inline ::proto::DeclinePaymentRequestMessage* Message::mutable_declinepaymentrequestmessage() {
   ::proto::DeclinePaymentRequestMessage* _msg = _internal_mutable_declinepaymentrequestmessage();
@@ -45865,38 +47976,38 @@ inline ::proto::DeclinePaymentRequestMessage* Message::mutable_declinepaymentreq
 inline void Message::set_allocated_declinepaymentrequestmessage(::proto::DeclinePaymentRequestMessage* declinepaymentrequestmessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete declinepaymentrequestmessage_;
+    delete _impl_.declinepaymentrequestmessage_;
   }
   if (declinepaymentrequestmessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::DeclinePaymentRequestMessage>::GetOwningArena(declinepaymentrequestmessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(declinepaymentrequestmessage);
     if (message_arena != submessage_arena) {
       declinepaymentrequestmessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, declinepaymentrequestmessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x00040000u;
+    _impl_._has_bits_[0] |= 0x00040000u;
   } else {
-    _has_bits_[0] &= ~0x00040000u;
+    _impl_._has_bits_[0] &= ~0x00040000u;
   }
-  declinepaymentrequestmessage_ = declinepaymentrequestmessage;
+  _impl_.declinepaymentrequestmessage_ = declinepaymentrequestmessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.declinePaymentRequestMessage)
 }
 
 // optional .proto.CancelPaymentRequestMessage cancelPaymentRequestMessage = 24;
 inline bool Message::_internal_has_cancelpaymentrequestmessage() const {
-  bool value = (_has_bits_[0] & 0x00080000u) != 0;
-  PROTOBUF_ASSUME(!value || cancelpaymentrequestmessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00080000u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.cancelpaymentrequestmessage_ != nullptr);
   return value;
 }
 inline bool Message::has_cancelpaymentrequestmessage() const {
   return _internal_has_cancelpaymentrequestmessage();
 }
 inline void Message::clear_cancelpaymentrequestmessage() {
-  if (cancelpaymentrequestmessage_ != nullptr) cancelpaymentrequestmessage_->Clear();
-  _has_bits_[0] &= ~0x00080000u;
+  if (_impl_.cancelpaymentrequestmessage_ != nullptr) _impl_.cancelpaymentrequestmessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x00080000u;
 }
 inline const ::proto::CancelPaymentRequestMessage& Message::_internal_cancelpaymentrequestmessage() const {
-  const ::proto::CancelPaymentRequestMessage* p = cancelpaymentrequestmessage_;
+  const ::proto::CancelPaymentRequestMessage* p = _impl_.cancelpaymentrequestmessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::CancelPaymentRequestMessage&>(
       ::proto::_CancelPaymentRequestMessage_default_instance_);
 }
@@ -45907,20 +48018,20 @@ inline const ::proto::CancelPaymentRequestMessage& Message::cancelpaymentrequest
 inline void Message::unsafe_arena_set_allocated_cancelpaymentrequestmessage(
     ::proto::CancelPaymentRequestMessage* cancelpaymentrequestmessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(cancelpaymentrequestmessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.cancelpaymentrequestmessage_);
   }
-  cancelpaymentrequestmessage_ = cancelpaymentrequestmessage;
+  _impl_.cancelpaymentrequestmessage_ = cancelpaymentrequestmessage;
   if (cancelpaymentrequestmessage) {
-    _has_bits_[0] |= 0x00080000u;
+    _impl_._has_bits_[0] |= 0x00080000u;
   } else {
-    _has_bits_[0] &= ~0x00080000u;
+    _impl_._has_bits_[0] &= ~0x00080000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.cancelPaymentRequestMessage)
 }
 inline ::proto::CancelPaymentRequestMessage* Message::release_cancelpaymentrequestmessage() {
-  _has_bits_[0] &= ~0x00080000u;
-  ::proto::CancelPaymentRequestMessage* temp = cancelpaymentrequestmessage_;
-  cancelpaymentrequestmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00080000u;
+  ::proto::CancelPaymentRequestMessage* temp = _impl_.cancelpaymentrequestmessage_;
+  _impl_.cancelpaymentrequestmessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -45934,18 +48045,18 @@ inline ::proto::CancelPaymentRequestMessage* Message::release_cancelpaymentreque
 }
 inline ::proto::CancelPaymentRequestMessage* Message::unsafe_arena_release_cancelpaymentrequestmessage() {
   // @@protoc_insertion_point(field_release:proto.Message.cancelPaymentRequestMessage)
-  _has_bits_[0] &= ~0x00080000u;
-  ::proto::CancelPaymentRequestMessage* temp = cancelpaymentrequestmessage_;
-  cancelpaymentrequestmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00080000u;
+  ::proto::CancelPaymentRequestMessage* temp = _impl_.cancelpaymentrequestmessage_;
+  _impl_.cancelpaymentrequestmessage_ = nullptr;
   return temp;
 }
 inline ::proto::CancelPaymentRequestMessage* Message::_internal_mutable_cancelpaymentrequestmessage() {
-  _has_bits_[0] |= 0x00080000u;
-  if (cancelpaymentrequestmessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00080000u;
+  if (_impl_.cancelpaymentrequestmessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::CancelPaymentRequestMessage>(GetArenaForAllocation());
-    cancelpaymentrequestmessage_ = p;
+    _impl_.cancelpaymentrequestmessage_ = p;
   }
-  return cancelpaymentrequestmessage_;
+  return _impl_.cancelpaymentrequestmessage_;
 }
 inline ::proto::CancelPaymentRequestMessage* Message::mutable_cancelpaymentrequestmessage() {
   ::proto::CancelPaymentRequestMessage* _msg = _internal_mutable_cancelpaymentrequestmessage();
@@ -45955,38 +48066,38 @@ inline ::proto::CancelPaymentRequestMessage* Message::mutable_cancelpaymentreque
 inline void Message::set_allocated_cancelpaymentrequestmessage(::proto::CancelPaymentRequestMessage* cancelpaymentrequestmessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete cancelpaymentrequestmessage_;
+    delete _impl_.cancelpaymentrequestmessage_;
   }
   if (cancelpaymentrequestmessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::CancelPaymentRequestMessage>::GetOwningArena(cancelpaymentrequestmessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(cancelpaymentrequestmessage);
     if (message_arena != submessage_arena) {
       cancelpaymentrequestmessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, cancelpaymentrequestmessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x00080000u;
+    _impl_._has_bits_[0] |= 0x00080000u;
   } else {
-    _has_bits_[0] &= ~0x00080000u;
+    _impl_._has_bits_[0] &= ~0x00080000u;
   }
-  cancelpaymentrequestmessage_ = cancelpaymentrequestmessage;
+  _impl_.cancelpaymentrequestmessage_ = cancelpaymentrequestmessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.cancelPaymentRequestMessage)
 }
 
 // optional .proto.TemplateMessage templateMessage = 25;
 inline bool Message::_internal_has_templatemessage() const {
-  bool value = (_has_bits_[0] & 0x00100000u) != 0;
-  PROTOBUF_ASSUME(!value || templatemessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00100000u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.templatemessage_ != nullptr);
   return value;
 }
 inline bool Message::has_templatemessage() const {
   return _internal_has_templatemessage();
 }
 inline void Message::clear_templatemessage() {
-  if (templatemessage_ != nullptr) templatemessage_->Clear();
-  _has_bits_[0] &= ~0x00100000u;
+  if (_impl_.templatemessage_ != nullptr) _impl_.templatemessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x00100000u;
 }
 inline const ::proto::TemplateMessage& Message::_internal_templatemessage() const {
-  const ::proto::TemplateMessage* p = templatemessage_;
+  const ::proto::TemplateMessage* p = _impl_.templatemessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::TemplateMessage&>(
       ::proto::_TemplateMessage_default_instance_);
 }
@@ -45997,20 +48108,20 @@ inline const ::proto::TemplateMessage& Message::templatemessage() const {
 inline void Message::unsafe_arena_set_allocated_templatemessage(
     ::proto::TemplateMessage* templatemessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(templatemessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.templatemessage_);
   }
-  templatemessage_ = templatemessage;
+  _impl_.templatemessage_ = templatemessage;
   if (templatemessage) {
-    _has_bits_[0] |= 0x00100000u;
+    _impl_._has_bits_[0] |= 0x00100000u;
   } else {
-    _has_bits_[0] &= ~0x00100000u;
+    _impl_._has_bits_[0] &= ~0x00100000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.templateMessage)
 }
 inline ::proto::TemplateMessage* Message::release_templatemessage() {
-  _has_bits_[0] &= ~0x00100000u;
-  ::proto::TemplateMessage* temp = templatemessage_;
-  templatemessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00100000u;
+  ::proto::TemplateMessage* temp = _impl_.templatemessage_;
+  _impl_.templatemessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -46024,18 +48135,18 @@ inline ::proto::TemplateMessage* Message::release_templatemessage() {
 }
 inline ::proto::TemplateMessage* Message::unsafe_arena_release_templatemessage() {
   // @@protoc_insertion_point(field_release:proto.Message.templateMessage)
-  _has_bits_[0] &= ~0x00100000u;
-  ::proto::TemplateMessage* temp = templatemessage_;
-  templatemessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00100000u;
+  ::proto::TemplateMessage* temp = _impl_.templatemessage_;
+  _impl_.templatemessage_ = nullptr;
   return temp;
 }
 inline ::proto::TemplateMessage* Message::_internal_mutable_templatemessage() {
-  _has_bits_[0] |= 0x00100000u;
-  if (templatemessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00100000u;
+  if (_impl_.templatemessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::TemplateMessage>(GetArenaForAllocation());
-    templatemessage_ = p;
+    _impl_.templatemessage_ = p;
   }
-  return templatemessage_;
+  return _impl_.templatemessage_;
 }
 inline ::proto::TemplateMessage* Message::mutable_templatemessage() {
   ::proto::TemplateMessage* _msg = _internal_mutable_templatemessage();
@@ -46045,38 +48156,38 @@ inline ::proto::TemplateMessage* Message::mutable_templatemessage() {
 inline void Message::set_allocated_templatemessage(::proto::TemplateMessage* templatemessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete templatemessage_;
+    delete _impl_.templatemessage_;
   }
   if (templatemessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::TemplateMessage>::GetOwningArena(templatemessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(templatemessage);
     if (message_arena != submessage_arena) {
       templatemessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, templatemessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x00100000u;
+    _impl_._has_bits_[0] |= 0x00100000u;
   } else {
-    _has_bits_[0] &= ~0x00100000u;
+    _impl_._has_bits_[0] &= ~0x00100000u;
   }
-  templatemessage_ = templatemessage;
+  _impl_.templatemessage_ = templatemessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.templateMessage)
 }
 
 // optional .proto.StickerMessage stickerMessage = 26;
 inline bool Message::_internal_has_stickermessage() const {
-  bool value = (_has_bits_[0] & 0x00200000u) != 0;
-  PROTOBUF_ASSUME(!value || stickermessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00200000u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.stickermessage_ != nullptr);
   return value;
 }
 inline bool Message::has_stickermessage() const {
   return _internal_has_stickermessage();
 }
 inline void Message::clear_stickermessage() {
-  if (stickermessage_ != nullptr) stickermessage_->Clear();
-  _has_bits_[0] &= ~0x00200000u;
+  if (_impl_.stickermessage_ != nullptr) _impl_.stickermessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x00200000u;
 }
 inline const ::proto::StickerMessage& Message::_internal_stickermessage() const {
-  const ::proto::StickerMessage* p = stickermessage_;
+  const ::proto::StickerMessage* p = _impl_.stickermessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::StickerMessage&>(
       ::proto::_StickerMessage_default_instance_);
 }
@@ -46087,20 +48198,20 @@ inline const ::proto::StickerMessage& Message::stickermessage() const {
 inline void Message::unsafe_arena_set_allocated_stickermessage(
     ::proto::StickerMessage* stickermessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(stickermessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.stickermessage_);
   }
-  stickermessage_ = stickermessage;
+  _impl_.stickermessage_ = stickermessage;
   if (stickermessage) {
-    _has_bits_[0] |= 0x00200000u;
+    _impl_._has_bits_[0] |= 0x00200000u;
   } else {
-    _has_bits_[0] &= ~0x00200000u;
+    _impl_._has_bits_[0] &= ~0x00200000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.stickerMessage)
 }
 inline ::proto::StickerMessage* Message::release_stickermessage() {
-  _has_bits_[0] &= ~0x00200000u;
-  ::proto::StickerMessage* temp = stickermessage_;
-  stickermessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00200000u;
+  ::proto::StickerMessage* temp = _impl_.stickermessage_;
+  _impl_.stickermessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -46114,18 +48225,18 @@ inline ::proto::StickerMessage* Message::release_stickermessage() {
 }
 inline ::proto::StickerMessage* Message::unsafe_arena_release_stickermessage() {
   // @@protoc_insertion_point(field_release:proto.Message.stickerMessage)
-  _has_bits_[0] &= ~0x00200000u;
-  ::proto::StickerMessage* temp = stickermessage_;
-  stickermessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00200000u;
+  ::proto::StickerMessage* temp = _impl_.stickermessage_;
+  _impl_.stickermessage_ = nullptr;
   return temp;
 }
 inline ::proto::StickerMessage* Message::_internal_mutable_stickermessage() {
-  _has_bits_[0] |= 0x00200000u;
-  if (stickermessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00200000u;
+  if (_impl_.stickermessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::StickerMessage>(GetArenaForAllocation());
-    stickermessage_ = p;
+    _impl_.stickermessage_ = p;
   }
-  return stickermessage_;
+  return _impl_.stickermessage_;
 }
 inline ::proto::StickerMessage* Message::mutable_stickermessage() {
   ::proto::StickerMessage* _msg = _internal_mutable_stickermessage();
@@ -46135,38 +48246,38 @@ inline ::proto::StickerMessage* Message::mutable_stickermessage() {
 inline void Message::set_allocated_stickermessage(::proto::StickerMessage* stickermessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete stickermessage_;
+    delete _impl_.stickermessage_;
   }
   if (stickermessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::StickerMessage>::GetOwningArena(stickermessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(stickermessage);
     if (message_arena != submessage_arena) {
       stickermessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, stickermessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x00200000u;
+    _impl_._has_bits_[0] |= 0x00200000u;
   } else {
-    _has_bits_[0] &= ~0x00200000u;
+    _impl_._has_bits_[0] &= ~0x00200000u;
   }
-  stickermessage_ = stickermessage;
+  _impl_.stickermessage_ = stickermessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.stickerMessage)
 }
 
 // optional .proto.GroupInviteMessage groupInviteMessage = 28;
 inline bool Message::_internal_has_groupinvitemessage() const {
-  bool value = (_has_bits_[0] & 0x00400000u) != 0;
-  PROTOBUF_ASSUME(!value || groupinvitemessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00400000u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.groupinvitemessage_ != nullptr);
   return value;
 }
 inline bool Message::has_groupinvitemessage() const {
   return _internal_has_groupinvitemessage();
 }
 inline void Message::clear_groupinvitemessage() {
-  if (groupinvitemessage_ != nullptr) groupinvitemessage_->Clear();
-  _has_bits_[0] &= ~0x00400000u;
+  if (_impl_.groupinvitemessage_ != nullptr) _impl_.groupinvitemessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x00400000u;
 }
 inline const ::proto::GroupInviteMessage& Message::_internal_groupinvitemessage() const {
-  const ::proto::GroupInviteMessage* p = groupinvitemessage_;
+  const ::proto::GroupInviteMessage* p = _impl_.groupinvitemessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::GroupInviteMessage&>(
       ::proto::_GroupInviteMessage_default_instance_);
 }
@@ -46177,20 +48288,20 @@ inline const ::proto::GroupInviteMessage& Message::groupinvitemessage() const {
 inline void Message::unsafe_arena_set_allocated_groupinvitemessage(
     ::proto::GroupInviteMessage* groupinvitemessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(groupinvitemessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.groupinvitemessage_);
   }
-  groupinvitemessage_ = groupinvitemessage;
+  _impl_.groupinvitemessage_ = groupinvitemessage;
   if (groupinvitemessage) {
-    _has_bits_[0] |= 0x00400000u;
+    _impl_._has_bits_[0] |= 0x00400000u;
   } else {
-    _has_bits_[0] &= ~0x00400000u;
+    _impl_._has_bits_[0] &= ~0x00400000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.groupInviteMessage)
 }
 inline ::proto::GroupInviteMessage* Message::release_groupinvitemessage() {
-  _has_bits_[0] &= ~0x00400000u;
-  ::proto::GroupInviteMessage* temp = groupinvitemessage_;
-  groupinvitemessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00400000u;
+  ::proto::GroupInviteMessage* temp = _impl_.groupinvitemessage_;
+  _impl_.groupinvitemessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -46204,18 +48315,18 @@ inline ::proto::GroupInviteMessage* Message::release_groupinvitemessage() {
 }
 inline ::proto::GroupInviteMessage* Message::unsafe_arena_release_groupinvitemessage() {
   // @@protoc_insertion_point(field_release:proto.Message.groupInviteMessage)
-  _has_bits_[0] &= ~0x00400000u;
-  ::proto::GroupInviteMessage* temp = groupinvitemessage_;
-  groupinvitemessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00400000u;
+  ::proto::GroupInviteMessage* temp = _impl_.groupinvitemessage_;
+  _impl_.groupinvitemessage_ = nullptr;
   return temp;
 }
 inline ::proto::GroupInviteMessage* Message::_internal_mutable_groupinvitemessage() {
-  _has_bits_[0] |= 0x00400000u;
-  if (groupinvitemessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00400000u;
+  if (_impl_.groupinvitemessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::GroupInviteMessage>(GetArenaForAllocation());
-    groupinvitemessage_ = p;
+    _impl_.groupinvitemessage_ = p;
   }
-  return groupinvitemessage_;
+  return _impl_.groupinvitemessage_;
 }
 inline ::proto::GroupInviteMessage* Message::mutable_groupinvitemessage() {
   ::proto::GroupInviteMessage* _msg = _internal_mutable_groupinvitemessage();
@@ -46225,38 +48336,38 @@ inline ::proto::GroupInviteMessage* Message::mutable_groupinvitemessage() {
 inline void Message::set_allocated_groupinvitemessage(::proto::GroupInviteMessage* groupinvitemessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete groupinvitemessage_;
+    delete _impl_.groupinvitemessage_;
   }
   if (groupinvitemessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::GroupInviteMessage>::GetOwningArena(groupinvitemessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(groupinvitemessage);
     if (message_arena != submessage_arena) {
       groupinvitemessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, groupinvitemessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x00400000u;
+    _impl_._has_bits_[0] |= 0x00400000u;
   } else {
-    _has_bits_[0] &= ~0x00400000u;
+    _impl_._has_bits_[0] &= ~0x00400000u;
   }
-  groupinvitemessage_ = groupinvitemessage;
+  _impl_.groupinvitemessage_ = groupinvitemessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.groupInviteMessage)
 }
 
 // optional .proto.TemplateButtonReplyMessage templateButtonReplyMessage = 29;
 inline bool Message::_internal_has_templatebuttonreplymessage() const {
-  bool value = (_has_bits_[0] & 0x00800000u) != 0;
-  PROTOBUF_ASSUME(!value || templatebuttonreplymessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00800000u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.templatebuttonreplymessage_ != nullptr);
   return value;
 }
 inline bool Message::has_templatebuttonreplymessage() const {
   return _internal_has_templatebuttonreplymessage();
 }
 inline void Message::clear_templatebuttonreplymessage() {
-  if (templatebuttonreplymessage_ != nullptr) templatebuttonreplymessage_->Clear();
-  _has_bits_[0] &= ~0x00800000u;
+  if (_impl_.templatebuttonreplymessage_ != nullptr) _impl_.templatebuttonreplymessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x00800000u;
 }
 inline const ::proto::TemplateButtonReplyMessage& Message::_internal_templatebuttonreplymessage() const {
-  const ::proto::TemplateButtonReplyMessage* p = templatebuttonreplymessage_;
+  const ::proto::TemplateButtonReplyMessage* p = _impl_.templatebuttonreplymessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::TemplateButtonReplyMessage&>(
       ::proto::_TemplateButtonReplyMessage_default_instance_);
 }
@@ -46267,20 +48378,20 @@ inline const ::proto::TemplateButtonReplyMessage& Message::templatebuttonreplyme
 inline void Message::unsafe_arena_set_allocated_templatebuttonreplymessage(
     ::proto::TemplateButtonReplyMessage* templatebuttonreplymessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(templatebuttonreplymessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.templatebuttonreplymessage_);
   }
-  templatebuttonreplymessage_ = templatebuttonreplymessage;
+  _impl_.templatebuttonreplymessage_ = templatebuttonreplymessage;
   if (templatebuttonreplymessage) {
-    _has_bits_[0] |= 0x00800000u;
+    _impl_._has_bits_[0] |= 0x00800000u;
   } else {
-    _has_bits_[0] &= ~0x00800000u;
+    _impl_._has_bits_[0] &= ~0x00800000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.templateButtonReplyMessage)
 }
 inline ::proto::TemplateButtonReplyMessage* Message::release_templatebuttonreplymessage() {
-  _has_bits_[0] &= ~0x00800000u;
-  ::proto::TemplateButtonReplyMessage* temp = templatebuttonreplymessage_;
-  templatebuttonreplymessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00800000u;
+  ::proto::TemplateButtonReplyMessage* temp = _impl_.templatebuttonreplymessage_;
+  _impl_.templatebuttonreplymessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -46294,18 +48405,18 @@ inline ::proto::TemplateButtonReplyMessage* Message::release_templatebuttonreply
 }
 inline ::proto::TemplateButtonReplyMessage* Message::unsafe_arena_release_templatebuttonreplymessage() {
   // @@protoc_insertion_point(field_release:proto.Message.templateButtonReplyMessage)
-  _has_bits_[0] &= ~0x00800000u;
-  ::proto::TemplateButtonReplyMessage* temp = templatebuttonreplymessage_;
-  templatebuttonreplymessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00800000u;
+  ::proto::TemplateButtonReplyMessage* temp = _impl_.templatebuttonreplymessage_;
+  _impl_.templatebuttonreplymessage_ = nullptr;
   return temp;
 }
 inline ::proto::TemplateButtonReplyMessage* Message::_internal_mutable_templatebuttonreplymessage() {
-  _has_bits_[0] |= 0x00800000u;
-  if (templatebuttonreplymessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00800000u;
+  if (_impl_.templatebuttonreplymessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::TemplateButtonReplyMessage>(GetArenaForAllocation());
-    templatebuttonreplymessage_ = p;
+    _impl_.templatebuttonreplymessage_ = p;
   }
-  return templatebuttonreplymessage_;
+  return _impl_.templatebuttonreplymessage_;
 }
 inline ::proto::TemplateButtonReplyMessage* Message::mutable_templatebuttonreplymessage() {
   ::proto::TemplateButtonReplyMessage* _msg = _internal_mutable_templatebuttonreplymessage();
@@ -46315,38 +48426,38 @@ inline ::proto::TemplateButtonReplyMessage* Message::mutable_templatebuttonreply
 inline void Message::set_allocated_templatebuttonreplymessage(::proto::TemplateButtonReplyMessage* templatebuttonreplymessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete templatebuttonreplymessage_;
+    delete _impl_.templatebuttonreplymessage_;
   }
   if (templatebuttonreplymessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::TemplateButtonReplyMessage>::GetOwningArena(templatebuttonreplymessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(templatebuttonreplymessage);
     if (message_arena != submessage_arena) {
       templatebuttonreplymessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, templatebuttonreplymessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x00800000u;
+    _impl_._has_bits_[0] |= 0x00800000u;
   } else {
-    _has_bits_[0] &= ~0x00800000u;
+    _impl_._has_bits_[0] &= ~0x00800000u;
   }
-  templatebuttonreplymessage_ = templatebuttonreplymessage;
+  _impl_.templatebuttonreplymessage_ = templatebuttonreplymessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.templateButtonReplyMessage)
 }
 
 // optional .proto.ProductMessage productMessage = 30;
 inline bool Message::_internal_has_productmessage() const {
-  bool value = (_has_bits_[0] & 0x01000000u) != 0;
-  PROTOBUF_ASSUME(!value || productmessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x01000000u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.productmessage_ != nullptr);
   return value;
 }
 inline bool Message::has_productmessage() const {
   return _internal_has_productmessage();
 }
 inline void Message::clear_productmessage() {
-  if (productmessage_ != nullptr) productmessage_->Clear();
-  _has_bits_[0] &= ~0x01000000u;
+  if (_impl_.productmessage_ != nullptr) _impl_.productmessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x01000000u;
 }
 inline const ::proto::ProductMessage& Message::_internal_productmessage() const {
-  const ::proto::ProductMessage* p = productmessage_;
+  const ::proto::ProductMessage* p = _impl_.productmessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ProductMessage&>(
       ::proto::_ProductMessage_default_instance_);
 }
@@ -46357,20 +48468,20 @@ inline const ::proto::ProductMessage& Message::productmessage() const {
 inline void Message::unsafe_arena_set_allocated_productmessage(
     ::proto::ProductMessage* productmessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(productmessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.productmessage_);
   }
-  productmessage_ = productmessage;
+  _impl_.productmessage_ = productmessage;
   if (productmessage) {
-    _has_bits_[0] |= 0x01000000u;
+    _impl_._has_bits_[0] |= 0x01000000u;
   } else {
-    _has_bits_[0] &= ~0x01000000u;
+    _impl_._has_bits_[0] &= ~0x01000000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.productMessage)
 }
 inline ::proto::ProductMessage* Message::release_productmessage() {
-  _has_bits_[0] &= ~0x01000000u;
-  ::proto::ProductMessage* temp = productmessage_;
-  productmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x01000000u;
+  ::proto::ProductMessage* temp = _impl_.productmessage_;
+  _impl_.productmessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -46384,18 +48495,18 @@ inline ::proto::ProductMessage* Message::release_productmessage() {
 }
 inline ::proto::ProductMessage* Message::unsafe_arena_release_productmessage() {
   // @@protoc_insertion_point(field_release:proto.Message.productMessage)
-  _has_bits_[0] &= ~0x01000000u;
-  ::proto::ProductMessage* temp = productmessage_;
-  productmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x01000000u;
+  ::proto::ProductMessage* temp = _impl_.productmessage_;
+  _impl_.productmessage_ = nullptr;
   return temp;
 }
 inline ::proto::ProductMessage* Message::_internal_mutable_productmessage() {
-  _has_bits_[0] |= 0x01000000u;
-  if (productmessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x01000000u;
+  if (_impl_.productmessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ProductMessage>(GetArenaForAllocation());
-    productmessage_ = p;
+    _impl_.productmessage_ = p;
   }
-  return productmessage_;
+  return _impl_.productmessage_;
 }
 inline ::proto::ProductMessage* Message::mutable_productmessage() {
   ::proto::ProductMessage* _msg = _internal_mutable_productmessage();
@@ -46405,38 +48516,38 @@ inline ::proto::ProductMessage* Message::mutable_productmessage() {
 inline void Message::set_allocated_productmessage(::proto::ProductMessage* productmessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete productmessage_;
+    delete _impl_.productmessage_;
   }
   if (productmessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ProductMessage>::GetOwningArena(productmessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(productmessage);
     if (message_arena != submessage_arena) {
       productmessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, productmessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x01000000u;
+    _impl_._has_bits_[0] |= 0x01000000u;
   } else {
-    _has_bits_[0] &= ~0x01000000u;
+    _impl_._has_bits_[0] &= ~0x01000000u;
   }
-  productmessage_ = productmessage;
+  _impl_.productmessage_ = productmessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.productMessage)
 }
 
 // optional .proto.DeviceSentMessage deviceSentMessage = 31;
 inline bool Message::_internal_has_devicesentmessage() const {
-  bool value = (_has_bits_[0] & 0x02000000u) != 0;
-  PROTOBUF_ASSUME(!value || devicesentmessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x02000000u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.devicesentmessage_ != nullptr);
   return value;
 }
 inline bool Message::has_devicesentmessage() const {
   return _internal_has_devicesentmessage();
 }
 inline void Message::clear_devicesentmessage() {
-  if (devicesentmessage_ != nullptr) devicesentmessage_->Clear();
-  _has_bits_[0] &= ~0x02000000u;
+  if (_impl_.devicesentmessage_ != nullptr) _impl_.devicesentmessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x02000000u;
 }
 inline const ::proto::DeviceSentMessage& Message::_internal_devicesentmessage() const {
-  const ::proto::DeviceSentMessage* p = devicesentmessage_;
+  const ::proto::DeviceSentMessage* p = _impl_.devicesentmessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::DeviceSentMessage&>(
       ::proto::_DeviceSentMessage_default_instance_);
 }
@@ -46447,20 +48558,20 @@ inline const ::proto::DeviceSentMessage& Message::devicesentmessage() const {
 inline void Message::unsafe_arena_set_allocated_devicesentmessage(
     ::proto::DeviceSentMessage* devicesentmessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(devicesentmessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.devicesentmessage_);
   }
-  devicesentmessage_ = devicesentmessage;
+  _impl_.devicesentmessage_ = devicesentmessage;
   if (devicesentmessage) {
-    _has_bits_[0] |= 0x02000000u;
+    _impl_._has_bits_[0] |= 0x02000000u;
   } else {
-    _has_bits_[0] &= ~0x02000000u;
+    _impl_._has_bits_[0] &= ~0x02000000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.deviceSentMessage)
 }
 inline ::proto::DeviceSentMessage* Message::release_devicesentmessage() {
-  _has_bits_[0] &= ~0x02000000u;
-  ::proto::DeviceSentMessage* temp = devicesentmessage_;
-  devicesentmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x02000000u;
+  ::proto::DeviceSentMessage* temp = _impl_.devicesentmessage_;
+  _impl_.devicesentmessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -46474,18 +48585,18 @@ inline ::proto::DeviceSentMessage* Message::release_devicesentmessage() {
 }
 inline ::proto::DeviceSentMessage* Message::unsafe_arena_release_devicesentmessage() {
   // @@protoc_insertion_point(field_release:proto.Message.deviceSentMessage)
-  _has_bits_[0] &= ~0x02000000u;
-  ::proto::DeviceSentMessage* temp = devicesentmessage_;
-  devicesentmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x02000000u;
+  ::proto::DeviceSentMessage* temp = _impl_.devicesentmessage_;
+  _impl_.devicesentmessage_ = nullptr;
   return temp;
 }
 inline ::proto::DeviceSentMessage* Message::_internal_mutable_devicesentmessage() {
-  _has_bits_[0] |= 0x02000000u;
-  if (devicesentmessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x02000000u;
+  if (_impl_.devicesentmessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::DeviceSentMessage>(GetArenaForAllocation());
-    devicesentmessage_ = p;
+    _impl_.devicesentmessage_ = p;
   }
-  return devicesentmessage_;
+  return _impl_.devicesentmessage_;
 }
 inline ::proto::DeviceSentMessage* Message::mutable_devicesentmessage() {
   ::proto::DeviceSentMessage* _msg = _internal_mutable_devicesentmessage();
@@ -46495,38 +48606,38 @@ inline ::proto::DeviceSentMessage* Message::mutable_devicesentmessage() {
 inline void Message::set_allocated_devicesentmessage(::proto::DeviceSentMessage* devicesentmessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete devicesentmessage_;
+    delete _impl_.devicesentmessage_;
   }
   if (devicesentmessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::DeviceSentMessage>::GetOwningArena(devicesentmessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(devicesentmessage);
     if (message_arena != submessage_arena) {
       devicesentmessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, devicesentmessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x02000000u;
+    _impl_._has_bits_[0] |= 0x02000000u;
   } else {
-    _has_bits_[0] &= ~0x02000000u;
+    _impl_._has_bits_[0] &= ~0x02000000u;
   }
-  devicesentmessage_ = devicesentmessage;
+  _impl_.devicesentmessage_ = devicesentmessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.deviceSentMessage)
 }
 
 // optional .proto.MessageContextInfo messageContextInfo = 35;
 inline bool Message::_internal_has_messagecontextinfo() const {
-  bool value = (_has_bits_[0] & 0x04000000u) != 0;
-  PROTOBUF_ASSUME(!value || messagecontextinfo_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x04000000u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.messagecontextinfo_ != nullptr);
   return value;
 }
 inline bool Message::has_messagecontextinfo() const {
   return _internal_has_messagecontextinfo();
 }
 inline void Message::clear_messagecontextinfo() {
-  if (messagecontextinfo_ != nullptr) messagecontextinfo_->Clear();
-  _has_bits_[0] &= ~0x04000000u;
+  if (_impl_.messagecontextinfo_ != nullptr) _impl_.messagecontextinfo_->Clear();
+  _impl_._has_bits_[0] &= ~0x04000000u;
 }
 inline const ::proto::MessageContextInfo& Message::_internal_messagecontextinfo() const {
-  const ::proto::MessageContextInfo* p = messagecontextinfo_;
+  const ::proto::MessageContextInfo* p = _impl_.messagecontextinfo_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::MessageContextInfo&>(
       ::proto::_MessageContextInfo_default_instance_);
 }
@@ -46537,20 +48648,20 @@ inline const ::proto::MessageContextInfo& Message::messagecontextinfo() const {
 inline void Message::unsafe_arena_set_allocated_messagecontextinfo(
     ::proto::MessageContextInfo* messagecontextinfo) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(messagecontextinfo_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.messagecontextinfo_);
   }
-  messagecontextinfo_ = messagecontextinfo;
+  _impl_.messagecontextinfo_ = messagecontextinfo;
   if (messagecontextinfo) {
-    _has_bits_[0] |= 0x04000000u;
+    _impl_._has_bits_[0] |= 0x04000000u;
   } else {
-    _has_bits_[0] &= ~0x04000000u;
+    _impl_._has_bits_[0] &= ~0x04000000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.messageContextInfo)
 }
 inline ::proto::MessageContextInfo* Message::release_messagecontextinfo() {
-  _has_bits_[0] &= ~0x04000000u;
-  ::proto::MessageContextInfo* temp = messagecontextinfo_;
-  messagecontextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x04000000u;
+  ::proto::MessageContextInfo* temp = _impl_.messagecontextinfo_;
+  _impl_.messagecontextinfo_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -46564,18 +48675,18 @@ inline ::proto::MessageContextInfo* Message::release_messagecontextinfo() {
 }
 inline ::proto::MessageContextInfo* Message::unsafe_arena_release_messagecontextinfo() {
   // @@protoc_insertion_point(field_release:proto.Message.messageContextInfo)
-  _has_bits_[0] &= ~0x04000000u;
-  ::proto::MessageContextInfo* temp = messagecontextinfo_;
-  messagecontextinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x04000000u;
+  ::proto::MessageContextInfo* temp = _impl_.messagecontextinfo_;
+  _impl_.messagecontextinfo_ = nullptr;
   return temp;
 }
 inline ::proto::MessageContextInfo* Message::_internal_mutable_messagecontextinfo() {
-  _has_bits_[0] |= 0x04000000u;
-  if (messagecontextinfo_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x04000000u;
+  if (_impl_.messagecontextinfo_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::MessageContextInfo>(GetArenaForAllocation());
-    messagecontextinfo_ = p;
+    _impl_.messagecontextinfo_ = p;
   }
-  return messagecontextinfo_;
+  return _impl_.messagecontextinfo_;
 }
 inline ::proto::MessageContextInfo* Message::mutable_messagecontextinfo() {
   ::proto::MessageContextInfo* _msg = _internal_mutable_messagecontextinfo();
@@ -46585,38 +48696,38 @@ inline ::proto::MessageContextInfo* Message::mutable_messagecontextinfo() {
 inline void Message::set_allocated_messagecontextinfo(::proto::MessageContextInfo* messagecontextinfo) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete messagecontextinfo_;
+    delete _impl_.messagecontextinfo_;
   }
   if (messagecontextinfo) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::MessageContextInfo>::GetOwningArena(messagecontextinfo);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(messagecontextinfo);
     if (message_arena != submessage_arena) {
       messagecontextinfo = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, messagecontextinfo, submessage_arena);
     }
-    _has_bits_[0] |= 0x04000000u;
+    _impl_._has_bits_[0] |= 0x04000000u;
   } else {
-    _has_bits_[0] &= ~0x04000000u;
+    _impl_._has_bits_[0] &= ~0x04000000u;
   }
-  messagecontextinfo_ = messagecontextinfo;
+  _impl_.messagecontextinfo_ = messagecontextinfo;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.messageContextInfo)
 }
 
 // optional .proto.ListMessage listMessage = 36;
 inline bool Message::_internal_has_listmessage() const {
-  bool value = (_has_bits_[0] & 0x08000000u) != 0;
-  PROTOBUF_ASSUME(!value || listmessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x08000000u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.listmessage_ != nullptr);
   return value;
 }
 inline bool Message::has_listmessage() const {
   return _internal_has_listmessage();
 }
 inline void Message::clear_listmessage() {
-  if (listmessage_ != nullptr) listmessage_->Clear();
-  _has_bits_[0] &= ~0x08000000u;
+  if (_impl_.listmessage_ != nullptr) _impl_.listmessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x08000000u;
 }
 inline const ::proto::ListMessage& Message::_internal_listmessage() const {
-  const ::proto::ListMessage* p = listmessage_;
+  const ::proto::ListMessage* p = _impl_.listmessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ListMessage&>(
       ::proto::_ListMessage_default_instance_);
 }
@@ -46627,20 +48738,20 @@ inline const ::proto::ListMessage& Message::listmessage() const {
 inline void Message::unsafe_arena_set_allocated_listmessage(
     ::proto::ListMessage* listmessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(listmessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.listmessage_);
   }
-  listmessage_ = listmessage;
+  _impl_.listmessage_ = listmessage;
   if (listmessage) {
-    _has_bits_[0] |= 0x08000000u;
+    _impl_._has_bits_[0] |= 0x08000000u;
   } else {
-    _has_bits_[0] &= ~0x08000000u;
+    _impl_._has_bits_[0] &= ~0x08000000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.listMessage)
 }
 inline ::proto::ListMessage* Message::release_listmessage() {
-  _has_bits_[0] &= ~0x08000000u;
-  ::proto::ListMessage* temp = listmessage_;
-  listmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x08000000u;
+  ::proto::ListMessage* temp = _impl_.listmessage_;
+  _impl_.listmessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -46654,18 +48765,18 @@ inline ::proto::ListMessage* Message::release_listmessage() {
 }
 inline ::proto::ListMessage* Message::unsafe_arena_release_listmessage() {
   // @@protoc_insertion_point(field_release:proto.Message.listMessage)
-  _has_bits_[0] &= ~0x08000000u;
-  ::proto::ListMessage* temp = listmessage_;
-  listmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x08000000u;
+  ::proto::ListMessage* temp = _impl_.listmessage_;
+  _impl_.listmessage_ = nullptr;
   return temp;
 }
 inline ::proto::ListMessage* Message::_internal_mutable_listmessage() {
-  _has_bits_[0] |= 0x08000000u;
-  if (listmessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x08000000u;
+  if (_impl_.listmessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ListMessage>(GetArenaForAllocation());
-    listmessage_ = p;
+    _impl_.listmessage_ = p;
   }
-  return listmessage_;
+  return _impl_.listmessage_;
 }
 inline ::proto::ListMessage* Message::mutable_listmessage() {
   ::proto::ListMessage* _msg = _internal_mutable_listmessage();
@@ -46675,38 +48786,38 @@ inline ::proto::ListMessage* Message::mutable_listmessage() {
 inline void Message::set_allocated_listmessage(::proto::ListMessage* listmessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete listmessage_;
+    delete _impl_.listmessage_;
   }
   if (listmessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ListMessage>::GetOwningArena(listmessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(listmessage);
     if (message_arena != submessage_arena) {
       listmessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, listmessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x08000000u;
+    _impl_._has_bits_[0] |= 0x08000000u;
   } else {
-    _has_bits_[0] &= ~0x08000000u;
+    _impl_._has_bits_[0] &= ~0x08000000u;
   }
-  listmessage_ = listmessage;
+  _impl_.listmessage_ = listmessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.listMessage)
 }
 
 // optional .proto.FutureProofMessage viewOnceMessage = 37;
 inline bool Message::_internal_has_viewoncemessage() const {
-  bool value = (_has_bits_[0] & 0x10000000u) != 0;
-  PROTOBUF_ASSUME(!value || viewoncemessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x10000000u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.viewoncemessage_ != nullptr);
   return value;
 }
 inline bool Message::has_viewoncemessage() const {
   return _internal_has_viewoncemessage();
 }
 inline void Message::clear_viewoncemessage() {
-  if (viewoncemessage_ != nullptr) viewoncemessage_->Clear();
-  _has_bits_[0] &= ~0x10000000u;
+  if (_impl_.viewoncemessage_ != nullptr) _impl_.viewoncemessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x10000000u;
 }
 inline const ::proto::FutureProofMessage& Message::_internal_viewoncemessage() const {
-  const ::proto::FutureProofMessage* p = viewoncemessage_;
+  const ::proto::FutureProofMessage* p = _impl_.viewoncemessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::FutureProofMessage&>(
       ::proto::_FutureProofMessage_default_instance_);
 }
@@ -46717,20 +48828,20 @@ inline const ::proto::FutureProofMessage& Message::viewoncemessage() const {
 inline void Message::unsafe_arena_set_allocated_viewoncemessage(
     ::proto::FutureProofMessage* viewoncemessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(viewoncemessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.viewoncemessage_);
   }
-  viewoncemessage_ = viewoncemessage;
+  _impl_.viewoncemessage_ = viewoncemessage;
   if (viewoncemessage) {
-    _has_bits_[0] |= 0x10000000u;
+    _impl_._has_bits_[0] |= 0x10000000u;
   } else {
-    _has_bits_[0] &= ~0x10000000u;
+    _impl_._has_bits_[0] &= ~0x10000000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.viewOnceMessage)
 }
 inline ::proto::FutureProofMessage* Message::release_viewoncemessage() {
-  _has_bits_[0] &= ~0x10000000u;
-  ::proto::FutureProofMessage* temp = viewoncemessage_;
-  viewoncemessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x10000000u;
+  ::proto::FutureProofMessage* temp = _impl_.viewoncemessage_;
+  _impl_.viewoncemessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -46744,18 +48855,18 @@ inline ::proto::FutureProofMessage* Message::release_viewoncemessage() {
 }
 inline ::proto::FutureProofMessage* Message::unsafe_arena_release_viewoncemessage() {
   // @@protoc_insertion_point(field_release:proto.Message.viewOnceMessage)
-  _has_bits_[0] &= ~0x10000000u;
-  ::proto::FutureProofMessage* temp = viewoncemessage_;
-  viewoncemessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x10000000u;
+  ::proto::FutureProofMessage* temp = _impl_.viewoncemessage_;
+  _impl_.viewoncemessage_ = nullptr;
   return temp;
 }
 inline ::proto::FutureProofMessage* Message::_internal_mutable_viewoncemessage() {
-  _has_bits_[0] |= 0x10000000u;
-  if (viewoncemessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x10000000u;
+  if (_impl_.viewoncemessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::FutureProofMessage>(GetArenaForAllocation());
-    viewoncemessage_ = p;
+    _impl_.viewoncemessage_ = p;
   }
-  return viewoncemessage_;
+  return _impl_.viewoncemessage_;
 }
 inline ::proto::FutureProofMessage* Message::mutable_viewoncemessage() {
   ::proto::FutureProofMessage* _msg = _internal_mutable_viewoncemessage();
@@ -46765,38 +48876,38 @@ inline ::proto::FutureProofMessage* Message::mutable_viewoncemessage() {
 inline void Message::set_allocated_viewoncemessage(::proto::FutureProofMessage* viewoncemessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete viewoncemessage_;
+    delete _impl_.viewoncemessage_;
   }
   if (viewoncemessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::FutureProofMessage>::GetOwningArena(viewoncemessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(viewoncemessage);
     if (message_arena != submessage_arena) {
       viewoncemessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, viewoncemessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x10000000u;
+    _impl_._has_bits_[0] |= 0x10000000u;
   } else {
-    _has_bits_[0] &= ~0x10000000u;
+    _impl_._has_bits_[0] &= ~0x10000000u;
   }
-  viewoncemessage_ = viewoncemessage;
+  _impl_.viewoncemessage_ = viewoncemessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.viewOnceMessage)
 }
 
 // optional .proto.OrderMessage orderMessage = 38;
 inline bool Message::_internal_has_ordermessage() const {
-  bool value = (_has_bits_[0] & 0x20000000u) != 0;
-  PROTOBUF_ASSUME(!value || ordermessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x20000000u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.ordermessage_ != nullptr);
   return value;
 }
 inline bool Message::has_ordermessage() const {
   return _internal_has_ordermessage();
 }
 inline void Message::clear_ordermessage() {
-  if (ordermessage_ != nullptr) ordermessage_->Clear();
-  _has_bits_[0] &= ~0x20000000u;
+  if (_impl_.ordermessage_ != nullptr) _impl_.ordermessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x20000000u;
 }
 inline const ::proto::OrderMessage& Message::_internal_ordermessage() const {
-  const ::proto::OrderMessage* p = ordermessage_;
+  const ::proto::OrderMessage* p = _impl_.ordermessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::OrderMessage&>(
       ::proto::_OrderMessage_default_instance_);
 }
@@ -46807,20 +48918,20 @@ inline const ::proto::OrderMessage& Message::ordermessage() const {
 inline void Message::unsafe_arena_set_allocated_ordermessage(
     ::proto::OrderMessage* ordermessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(ordermessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.ordermessage_);
   }
-  ordermessage_ = ordermessage;
+  _impl_.ordermessage_ = ordermessage;
   if (ordermessage) {
-    _has_bits_[0] |= 0x20000000u;
+    _impl_._has_bits_[0] |= 0x20000000u;
   } else {
-    _has_bits_[0] &= ~0x20000000u;
+    _impl_._has_bits_[0] &= ~0x20000000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.orderMessage)
 }
 inline ::proto::OrderMessage* Message::release_ordermessage() {
-  _has_bits_[0] &= ~0x20000000u;
-  ::proto::OrderMessage* temp = ordermessage_;
-  ordermessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x20000000u;
+  ::proto::OrderMessage* temp = _impl_.ordermessage_;
+  _impl_.ordermessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -46834,18 +48945,18 @@ inline ::proto::OrderMessage* Message::release_ordermessage() {
 }
 inline ::proto::OrderMessage* Message::unsafe_arena_release_ordermessage() {
   // @@protoc_insertion_point(field_release:proto.Message.orderMessage)
-  _has_bits_[0] &= ~0x20000000u;
-  ::proto::OrderMessage* temp = ordermessage_;
-  ordermessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x20000000u;
+  ::proto::OrderMessage* temp = _impl_.ordermessage_;
+  _impl_.ordermessage_ = nullptr;
   return temp;
 }
 inline ::proto::OrderMessage* Message::_internal_mutable_ordermessage() {
-  _has_bits_[0] |= 0x20000000u;
-  if (ordermessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x20000000u;
+  if (_impl_.ordermessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::OrderMessage>(GetArenaForAllocation());
-    ordermessage_ = p;
+    _impl_.ordermessage_ = p;
   }
-  return ordermessage_;
+  return _impl_.ordermessage_;
 }
 inline ::proto::OrderMessage* Message::mutable_ordermessage() {
   ::proto::OrderMessage* _msg = _internal_mutable_ordermessage();
@@ -46855,38 +48966,38 @@ inline ::proto::OrderMessage* Message::mutable_ordermessage() {
 inline void Message::set_allocated_ordermessage(::proto::OrderMessage* ordermessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete ordermessage_;
+    delete _impl_.ordermessage_;
   }
   if (ordermessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::OrderMessage>::GetOwningArena(ordermessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(ordermessage);
     if (message_arena != submessage_arena) {
       ordermessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, ordermessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x20000000u;
+    _impl_._has_bits_[0] |= 0x20000000u;
   } else {
-    _has_bits_[0] &= ~0x20000000u;
+    _impl_._has_bits_[0] &= ~0x20000000u;
   }
-  ordermessage_ = ordermessage;
+  _impl_.ordermessage_ = ordermessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.orderMessage)
 }
 
 // optional .proto.ListResponseMessage listResponseMessage = 39;
 inline bool Message::_internal_has_listresponsemessage() const {
-  bool value = (_has_bits_[0] & 0x40000000u) != 0;
-  PROTOBUF_ASSUME(!value || listresponsemessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x40000000u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.listresponsemessage_ != nullptr);
   return value;
 }
 inline bool Message::has_listresponsemessage() const {
   return _internal_has_listresponsemessage();
 }
 inline void Message::clear_listresponsemessage() {
-  if (listresponsemessage_ != nullptr) listresponsemessage_->Clear();
-  _has_bits_[0] &= ~0x40000000u;
+  if (_impl_.listresponsemessage_ != nullptr) _impl_.listresponsemessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x40000000u;
 }
 inline const ::proto::ListResponseMessage& Message::_internal_listresponsemessage() const {
-  const ::proto::ListResponseMessage* p = listresponsemessage_;
+  const ::proto::ListResponseMessage* p = _impl_.listresponsemessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ListResponseMessage&>(
       ::proto::_ListResponseMessage_default_instance_);
 }
@@ -46897,20 +49008,20 @@ inline const ::proto::ListResponseMessage& Message::listresponsemessage() const
 inline void Message::unsafe_arena_set_allocated_listresponsemessage(
     ::proto::ListResponseMessage* listresponsemessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(listresponsemessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.listresponsemessage_);
   }
-  listresponsemessage_ = listresponsemessage;
+  _impl_.listresponsemessage_ = listresponsemessage;
   if (listresponsemessage) {
-    _has_bits_[0] |= 0x40000000u;
+    _impl_._has_bits_[0] |= 0x40000000u;
   } else {
-    _has_bits_[0] &= ~0x40000000u;
+    _impl_._has_bits_[0] &= ~0x40000000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.listResponseMessage)
 }
 inline ::proto::ListResponseMessage* Message::release_listresponsemessage() {
-  _has_bits_[0] &= ~0x40000000u;
-  ::proto::ListResponseMessage* temp = listresponsemessage_;
-  listresponsemessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x40000000u;
+  ::proto::ListResponseMessage* temp = _impl_.listresponsemessage_;
+  _impl_.listresponsemessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -46924,18 +49035,18 @@ inline ::proto::ListResponseMessage* Message::release_listresponsemessage() {
 }
 inline ::proto::ListResponseMessage* Message::unsafe_arena_release_listresponsemessage() {
   // @@protoc_insertion_point(field_release:proto.Message.listResponseMessage)
-  _has_bits_[0] &= ~0x40000000u;
-  ::proto::ListResponseMessage* temp = listresponsemessage_;
-  listresponsemessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x40000000u;
+  ::proto::ListResponseMessage* temp = _impl_.listresponsemessage_;
+  _impl_.listresponsemessage_ = nullptr;
   return temp;
 }
 inline ::proto::ListResponseMessage* Message::_internal_mutable_listresponsemessage() {
-  _has_bits_[0] |= 0x40000000u;
-  if (listresponsemessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x40000000u;
+  if (_impl_.listresponsemessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ListResponseMessage>(GetArenaForAllocation());
-    listresponsemessage_ = p;
+    _impl_.listresponsemessage_ = p;
   }
-  return listresponsemessage_;
+  return _impl_.listresponsemessage_;
 }
 inline ::proto::ListResponseMessage* Message::mutable_listresponsemessage() {
   ::proto::ListResponseMessage* _msg = _internal_mutable_listresponsemessage();
@@ -46945,38 +49056,38 @@ inline ::proto::ListResponseMessage* Message::mutable_listresponsemessage() {
 inline void Message::set_allocated_listresponsemessage(::proto::ListResponseMessage* listresponsemessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete listresponsemessage_;
+    delete _impl_.listresponsemessage_;
   }
   if (listresponsemessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ListResponseMessage>::GetOwningArena(listresponsemessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(listresponsemessage);
     if (message_arena != submessage_arena) {
       listresponsemessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, listresponsemessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x40000000u;
+    _impl_._has_bits_[0] |= 0x40000000u;
   } else {
-    _has_bits_[0] &= ~0x40000000u;
+    _impl_._has_bits_[0] &= ~0x40000000u;
   }
-  listresponsemessage_ = listresponsemessage;
+  _impl_.listresponsemessage_ = listresponsemessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.listResponseMessage)
 }
 
 // optional .proto.FutureProofMessage ephemeralMessage = 40;
 inline bool Message::_internal_has_ephemeralmessage() const {
-  bool value = (_has_bits_[0] & 0x80000000u) != 0;
-  PROTOBUF_ASSUME(!value || ephemeralmessage_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x80000000u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.ephemeralmessage_ != nullptr);
   return value;
 }
 inline bool Message::has_ephemeralmessage() const {
   return _internal_has_ephemeralmessage();
 }
 inline void Message::clear_ephemeralmessage() {
-  if (ephemeralmessage_ != nullptr) ephemeralmessage_->Clear();
-  _has_bits_[0] &= ~0x80000000u;
+  if (_impl_.ephemeralmessage_ != nullptr) _impl_.ephemeralmessage_->Clear();
+  _impl_._has_bits_[0] &= ~0x80000000u;
 }
 inline const ::proto::FutureProofMessage& Message::_internal_ephemeralmessage() const {
-  const ::proto::FutureProofMessage* p = ephemeralmessage_;
+  const ::proto::FutureProofMessage* p = _impl_.ephemeralmessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::FutureProofMessage&>(
       ::proto::_FutureProofMessage_default_instance_);
 }
@@ -46987,20 +49098,20 @@ inline const ::proto::FutureProofMessage& Message::ephemeralmessage() const {
 inline void Message::unsafe_arena_set_allocated_ephemeralmessage(
     ::proto::FutureProofMessage* ephemeralmessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(ephemeralmessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.ephemeralmessage_);
   }
-  ephemeralmessage_ = ephemeralmessage;
+  _impl_.ephemeralmessage_ = ephemeralmessage;
   if (ephemeralmessage) {
-    _has_bits_[0] |= 0x80000000u;
+    _impl_._has_bits_[0] |= 0x80000000u;
   } else {
-    _has_bits_[0] &= ~0x80000000u;
+    _impl_._has_bits_[0] &= ~0x80000000u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.ephemeralMessage)
 }
 inline ::proto::FutureProofMessage* Message::release_ephemeralmessage() {
-  _has_bits_[0] &= ~0x80000000u;
-  ::proto::FutureProofMessage* temp = ephemeralmessage_;
-  ephemeralmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x80000000u;
+  ::proto::FutureProofMessage* temp = _impl_.ephemeralmessage_;
+  _impl_.ephemeralmessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -47014,18 +49125,18 @@ inline ::proto::FutureProofMessage* Message::release_ephemeralmessage() {
 }
 inline ::proto::FutureProofMessage* Message::unsafe_arena_release_ephemeralmessage() {
   // @@protoc_insertion_point(field_release:proto.Message.ephemeralMessage)
-  _has_bits_[0] &= ~0x80000000u;
-  ::proto::FutureProofMessage* temp = ephemeralmessage_;
-  ephemeralmessage_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x80000000u;
+  ::proto::FutureProofMessage* temp = _impl_.ephemeralmessage_;
+  _impl_.ephemeralmessage_ = nullptr;
   return temp;
 }
 inline ::proto::FutureProofMessage* Message::_internal_mutable_ephemeralmessage() {
-  _has_bits_[0] |= 0x80000000u;
-  if (ephemeralmessage_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x80000000u;
+  if (_impl_.ephemeralmessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::FutureProofMessage>(GetArenaForAllocation());
-    ephemeralmessage_ = p;
+    _impl_.ephemeralmessage_ = p;
   }
-  return ephemeralmessage_;
+  return _impl_.ephemeralmessage_;
 }
 inline ::proto::FutureProofMessage* Message::mutable_ephemeralmessage() {
   ::proto::FutureProofMessage* _msg = _internal_mutable_ephemeralmessage();
@@ -47035,38 +49146,38 @@ inline ::proto::FutureProofMessage* Message::mutable_ephemeralmessage() {
 inline void Message::set_allocated_ephemeralmessage(::proto::FutureProofMessage* ephemeralmessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete ephemeralmessage_;
+    delete _impl_.ephemeralmessage_;
   }
   if (ephemeralmessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::FutureProofMessage>::GetOwningArena(ephemeralmessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(ephemeralmessage);
     if (message_arena != submessage_arena) {
       ephemeralmessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, ephemeralmessage, submessage_arena);
     }
-    _has_bits_[0] |= 0x80000000u;
+    _impl_._has_bits_[0] |= 0x80000000u;
   } else {
-    _has_bits_[0] &= ~0x80000000u;
+    _impl_._has_bits_[0] &= ~0x80000000u;
   }
-  ephemeralmessage_ = ephemeralmessage;
+  _impl_.ephemeralmessage_ = ephemeralmessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.ephemeralMessage)
 }
 
 // optional .proto.InvoiceMessage invoiceMessage = 41;
 inline bool Message::_internal_has_invoicemessage() const {
-  bool value = (_has_bits_[1] & 0x00000001u) != 0;
-  PROTOBUF_ASSUME(!value || invoicemessage_ != nullptr);
+  bool value = (_impl_._has_bits_[1] & 0x00000001u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.invoicemessage_ != nullptr);
   return value;
 }
 inline bool Message::has_invoicemessage() const {
   return _internal_has_invoicemessage();
 }
 inline void Message::clear_invoicemessage() {
-  if (invoicemessage_ != nullptr) invoicemessage_->Clear();
-  _has_bits_[1] &= ~0x00000001u;
+  if (_impl_.invoicemessage_ != nullptr) _impl_.invoicemessage_->Clear();
+  _impl_._has_bits_[1] &= ~0x00000001u;
 }
 inline const ::proto::InvoiceMessage& Message::_internal_invoicemessage() const {
-  const ::proto::InvoiceMessage* p = invoicemessage_;
+  const ::proto::InvoiceMessage* p = _impl_.invoicemessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::InvoiceMessage&>(
       ::proto::_InvoiceMessage_default_instance_);
 }
@@ -47077,20 +49188,20 @@ inline const ::proto::InvoiceMessage& Message::invoicemessage() const {
 inline void Message::unsafe_arena_set_allocated_invoicemessage(
     ::proto::InvoiceMessage* invoicemessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(invoicemessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.invoicemessage_);
   }
-  invoicemessage_ = invoicemessage;
+  _impl_.invoicemessage_ = invoicemessage;
   if (invoicemessage) {
-    _has_bits_[1] |= 0x00000001u;
+    _impl_._has_bits_[1] |= 0x00000001u;
   } else {
-    _has_bits_[1] &= ~0x00000001u;
+    _impl_._has_bits_[1] &= ~0x00000001u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.invoiceMessage)
 }
 inline ::proto::InvoiceMessage* Message::release_invoicemessage() {
-  _has_bits_[1] &= ~0x00000001u;
-  ::proto::InvoiceMessage* temp = invoicemessage_;
-  invoicemessage_ = nullptr;
+  _impl_._has_bits_[1] &= ~0x00000001u;
+  ::proto::InvoiceMessage* temp = _impl_.invoicemessage_;
+  _impl_.invoicemessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -47104,18 +49215,18 @@ inline ::proto::InvoiceMessage* Message::release_invoicemessage() {
 }
 inline ::proto::InvoiceMessage* Message::unsafe_arena_release_invoicemessage() {
   // @@protoc_insertion_point(field_release:proto.Message.invoiceMessage)
-  _has_bits_[1] &= ~0x00000001u;
-  ::proto::InvoiceMessage* temp = invoicemessage_;
-  invoicemessage_ = nullptr;
+  _impl_._has_bits_[1] &= ~0x00000001u;
+  ::proto::InvoiceMessage* temp = _impl_.invoicemessage_;
+  _impl_.invoicemessage_ = nullptr;
   return temp;
 }
 inline ::proto::InvoiceMessage* Message::_internal_mutable_invoicemessage() {
-  _has_bits_[1] |= 0x00000001u;
-  if (invoicemessage_ == nullptr) {
+  _impl_._has_bits_[1] |= 0x00000001u;
+  if (_impl_.invoicemessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::InvoiceMessage>(GetArenaForAllocation());
-    invoicemessage_ = p;
+    _impl_.invoicemessage_ = p;
   }
-  return invoicemessage_;
+  return _impl_.invoicemessage_;
 }
 inline ::proto::InvoiceMessage* Message::mutable_invoicemessage() {
   ::proto::InvoiceMessage* _msg = _internal_mutable_invoicemessage();
@@ -47125,38 +49236,38 @@ inline ::proto::InvoiceMessage* Message::mutable_invoicemessage() {
 inline void Message::set_allocated_invoicemessage(::proto::InvoiceMessage* invoicemessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete invoicemessage_;
+    delete _impl_.invoicemessage_;
   }
   if (invoicemessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::InvoiceMessage>::GetOwningArena(invoicemessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(invoicemessage);
     if (message_arena != submessage_arena) {
       invoicemessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, invoicemessage, submessage_arena);
     }
-    _has_bits_[1] |= 0x00000001u;
+    _impl_._has_bits_[1] |= 0x00000001u;
   } else {
-    _has_bits_[1] &= ~0x00000001u;
+    _impl_._has_bits_[1] &= ~0x00000001u;
   }
-  invoicemessage_ = invoicemessage;
+  _impl_.invoicemessage_ = invoicemessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.invoiceMessage)
 }
 
 // optional .proto.ButtonsMessage buttonsMessage = 42;
 inline bool Message::_internal_has_buttonsmessage() const {
-  bool value = (_has_bits_[1] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || buttonsmessage_ != nullptr);
+  bool value = (_impl_._has_bits_[1] & 0x00000002u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.buttonsmessage_ != nullptr);
   return value;
 }
 inline bool Message::has_buttonsmessage() const {
   return _internal_has_buttonsmessage();
 }
 inline void Message::clear_buttonsmessage() {
-  if (buttonsmessage_ != nullptr) buttonsmessage_->Clear();
-  _has_bits_[1] &= ~0x00000002u;
+  if (_impl_.buttonsmessage_ != nullptr) _impl_.buttonsmessage_->Clear();
+  _impl_._has_bits_[1] &= ~0x00000002u;
 }
 inline const ::proto::ButtonsMessage& Message::_internal_buttonsmessage() const {
-  const ::proto::ButtonsMessage* p = buttonsmessage_;
+  const ::proto::ButtonsMessage* p = _impl_.buttonsmessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ButtonsMessage&>(
       ::proto::_ButtonsMessage_default_instance_);
 }
@@ -47167,20 +49278,20 @@ inline const ::proto::ButtonsMessage& Message::buttonsmessage() const {
 inline void Message::unsafe_arena_set_allocated_buttonsmessage(
     ::proto::ButtonsMessage* buttonsmessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(buttonsmessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.buttonsmessage_);
   }
-  buttonsmessage_ = buttonsmessage;
+  _impl_.buttonsmessage_ = buttonsmessage;
   if (buttonsmessage) {
-    _has_bits_[1] |= 0x00000002u;
+    _impl_._has_bits_[1] |= 0x00000002u;
   } else {
-    _has_bits_[1] &= ~0x00000002u;
+    _impl_._has_bits_[1] &= ~0x00000002u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.buttonsMessage)
 }
 inline ::proto::ButtonsMessage* Message::release_buttonsmessage() {
-  _has_bits_[1] &= ~0x00000002u;
-  ::proto::ButtonsMessage* temp = buttonsmessage_;
-  buttonsmessage_ = nullptr;
+  _impl_._has_bits_[1] &= ~0x00000002u;
+  ::proto::ButtonsMessage* temp = _impl_.buttonsmessage_;
+  _impl_.buttonsmessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -47194,18 +49305,18 @@ inline ::proto::ButtonsMessage* Message::release_buttonsmessage() {
 }
 inline ::proto::ButtonsMessage* Message::unsafe_arena_release_buttonsmessage() {
   // @@protoc_insertion_point(field_release:proto.Message.buttonsMessage)
-  _has_bits_[1] &= ~0x00000002u;
-  ::proto::ButtonsMessage* temp = buttonsmessage_;
-  buttonsmessage_ = nullptr;
+  _impl_._has_bits_[1] &= ~0x00000002u;
+  ::proto::ButtonsMessage* temp = _impl_.buttonsmessage_;
+  _impl_.buttonsmessage_ = nullptr;
   return temp;
 }
 inline ::proto::ButtonsMessage* Message::_internal_mutable_buttonsmessage() {
-  _has_bits_[1] |= 0x00000002u;
-  if (buttonsmessage_ == nullptr) {
+  _impl_._has_bits_[1] |= 0x00000002u;
+  if (_impl_.buttonsmessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ButtonsMessage>(GetArenaForAllocation());
-    buttonsmessage_ = p;
+    _impl_.buttonsmessage_ = p;
   }
-  return buttonsmessage_;
+  return _impl_.buttonsmessage_;
 }
 inline ::proto::ButtonsMessage* Message::mutable_buttonsmessage() {
   ::proto::ButtonsMessage* _msg = _internal_mutable_buttonsmessage();
@@ -47215,38 +49326,38 @@ inline ::proto::ButtonsMessage* Message::mutable_buttonsmessage() {
 inline void Message::set_allocated_buttonsmessage(::proto::ButtonsMessage* buttonsmessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete buttonsmessage_;
+    delete _impl_.buttonsmessage_;
   }
   if (buttonsmessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ButtonsMessage>::GetOwningArena(buttonsmessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(buttonsmessage);
     if (message_arena != submessage_arena) {
       buttonsmessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, buttonsmessage, submessage_arena);
     }
-    _has_bits_[1] |= 0x00000002u;
+    _impl_._has_bits_[1] |= 0x00000002u;
   } else {
-    _has_bits_[1] &= ~0x00000002u;
+    _impl_._has_bits_[1] &= ~0x00000002u;
   }
-  buttonsmessage_ = buttonsmessage;
+  _impl_.buttonsmessage_ = buttonsmessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.buttonsMessage)
 }
 
 // optional .proto.ButtonsResponseMessage buttonsResponseMessage = 43;
 inline bool Message::_internal_has_buttonsresponsemessage() const {
-  bool value = (_has_bits_[1] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || buttonsresponsemessage_ != nullptr);
+  bool value = (_impl_._has_bits_[1] & 0x00000004u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.buttonsresponsemessage_ != nullptr);
   return value;
 }
 inline bool Message::has_buttonsresponsemessage() const {
   return _internal_has_buttonsresponsemessage();
 }
 inline void Message::clear_buttonsresponsemessage() {
-  if (buttonsresponsemessage_ != nullptr) buttonsresponsemessage_->Clear();
-  _has_bits_[1] &= ~0x00000004u;
+  if (_impl_.buttonsresponsemessage_ != nullptr) _impl_.buttonsresponsemessage_->Clear();
+  _impl_._has_bits_[1] &= ~0x00000004u;
 }
 inline const ::proto::ButtonsResponseMessage& Message::_internal_buttonsresponsemessage() const {
-  const ::proto::ButtonsResponseMessage* p = buttonsresponsemessage_;
+  const ::proto::ButtonsResponseMessage* p = _impl_.buttonsresponsemessage_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::ButtonsResponseMessage&>(
       ::proto::_ButtonsResponseMessage_default_instance_);
 }
@@ -47257,20 +49368,20 @@ inline const ::proto::ButtonsResponseMessage& Message::buttonsresponsemessage()
 inline void Message::unsafe_arena_set_allocated_buttonsresponsemessage(
     ::proto::ButtonsResponseMessage* buttonsresponsemessage) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(buttonsresponsemessage_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.buttonsresponsemessage_);
   }
-  buttonsresponsemessage_ = buttonsresponsemessage;
+  _impl_.buttonsresponsemessage_ = buttonsresponsemessage;
   if (buttonsresponsemessage) {
-    _has_bits_[1] |= 0x00000004u;
+    _impl_._has_bits_[1] |= 0x00000004u;
   } else {
-    _has_bits_[1] &= ~0x00000004u;
+    _impl_._has_bits_[1] &= ~0x00000004u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.Message.buttonsResponseMessage)
 }
 inline ::proto::ButtonsResponseMessage* Message::release_buttonsresponsemessage() {
-  _has_bits_[1] &= ~0x00000004u;
-  ::proto::ButtonsResponseMessage* temp = buttonsresponsemessage_;
-  buttonsresponsemessage_ = nullptr;
+  _impl_._has_bits_[1] &= ~0x00000004u;
+  ::proto::ButtonsResponseMessage* temp = _impl_.buttonsresponsemessage_;
+  _impl_.buttonsresponsemessage_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -47284,18 +49395,18 @@ inline ::proto::ButtonsResponseMessage* Message::release_buttonsresponsemessage(
 }
 inline ::proto::ButtonsResponseMessage* Message::unsafe_arena_release_buttonsresponsemessage() {
   // @@protoc_insertion_point(field_release:proto.Message.buttonsResponseMessage)
-  _has_bits_[1] &= ~0x00000004u;
-  ::proto::ButtonsResponseMessage* temp = buttonsresponsemessage_;
-  buttonsresponsemessage_ = nullptr;
+  _impl_._has_bits_[1] &= ~0x00000004u;
+  ::proto::ButtonsResponseMessage* temp = _impl_.buttonsresponsemessage_;
+  _impl_.buttonsresponsemessage_ = nullptr;
   return temp;
 }
 inline ::proto::ButtonsResponseMessage* Message::_internal_mutable_buttonsresponsemessage() {
-  _has_bits_[1] |= 0x00000004u;
-  if (buttonsresponsemessage_ == nullptr) {
+  _impl_._has_bits_[1] |= 0x00000004u;
+  if (_impl_.buttonsresponsemessage_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::ButtonsResponseMessage>(GetArenaForAllocation());
-    buttonsresponsemessage_ = p;
+    _impl_.buttonsresponsemessage_ = p;
   }
-  return buttonsresponsemessage_;
+  return _impl_.buttonsresponsemessage_;
 }
 inline ::proto::ButtonsResponseMessage* Message::mutable_buttonsresponsemessage() {
   ::proto::ButtonsResponseMessage* _msg = _internal_mutable_buttonsresponsemessage();
@@ -47305,20 +49416,20 @@ inline ::proto::ButtonsResponseMessage* Message::mutable_buttonsresponsemessage(
 inline void Message::set_allocated_buttonsresponsemessage(::proto::ButtonsResponseMessage* buttonsresponsemessage) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete buttonsresponsemessage_;
+    delete _impl_.buttonsresponsemessage_;
   }
   if (buttonsresponsemessage) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::ButtonsResponseMessage>::GetOwningArena(buttonsresponsemessage);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(buttonsresponsemessage);
     if (message_arena != submessage_arena) {
       buttonsresponsemessage = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, buttonsresponsemessage, submessage_arena);
     }
-    _has_bits_[1] |= 0x00000004u;
+    _impl_._has_bits_[1] |= 0x00000004u;
   } else {
-    _has_bits_[1] &= ~0x00000004u;
+    _impl_._has_bits_[1] &= ~0x00000004u;
   }
-  buttonsresponsemessage_ = buttonsresponsemessage;
+  _impl_.buttonsresponsemessage_ = buttonsresponsemessage;
   // @@protoc_insertion_point(field_set_allocated:proto.Message.buttonsResponseMessage)
 }
 
@@ -47328,15 +49439,15 @@ inline void Message::set_allocated_buttonsresponsemessage(::proto::ButtonsRespon
 
 // optional string remoteJid = 1;
 inline bool MessageKey::_internal_has_remotejid() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool MessageKey::has_remotejid() const {
   return _internal_has_remotejid();
 }
 inline void MessageKey::clear_remotejid() {
-  remotejid_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.remotejid_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& MessageKey::remotejid() const {
   // @@protoc_insertion_point(field_get:proto.MessageKey.remoteJid)
@@ -47345,8 +49456,8 @@ inline const std::string& MessageKey::remotejid() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void MessageKey::set_remotejid(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- remotejid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.remotejid_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.MessageKey.remoteJid)
 }
 inline std::string* MessageKey::mutable_remotejid() {
@@ -47355,57 +49466,67 @@ inline std::string* MessageKey::mutable_remotejid() {
   return _s;
 }
 inline const std::string& MessageKey::_internal_remotejid() const {
-  return remotejid_.Get();
+  return _impl_.remotejid_.Get();
 }
 inline void MessageKey::_internal_set_remotejid(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  remotejid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.remotejid_.Set(value, GetArenaForAllocation());
 }
 inline std::string* MessageKey::_internal_mutable_remotejid() {
-  _has_bits_[0] |= 0x00000001u;
-  return remotejid_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.remotejid_.Mutable(GetArenaForAllocation());
 }
 inline std::string* MessageKey::release_remotejid() {
   // @@protoc_insertion_point(field_release:proto.MessageKey.remoteJid)
   if (!_internal_has_remotejid()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return remotejid_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.remotejid_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.remotejid_.IsDefault()) {
+    _impl_.remotejid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void MessageKey::set_allocated_remotejid(std::string* remotejid) {
   if (remotejid != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  remotejid_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), remotejid,
-      GetArenaForAllocation());
+  _impl_.remotejid_.SetAllocated(remotejid, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.remotejid_.IsDefault()) {
+    _impl_.remotejid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.MessageKey.remoteJid)
 }
 
 // optional bool fromMe = 2;
 inline bool MessageKey::_internal_has_fromme() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool MessageKey::has_fromme() const {
   return _internal_has_fromme();
 }
 inline void MessageKey::clear_fromme() {
-  fromme_ = false;
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.fromme_ = false;
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline bool MessageKey::_internal_fromme() const {
-  return fromme_;
+  return _impl_.fromme_;
 }
 inline bool MessageKey::fromme() const {
   // @@protoc_insertion_point(field_get:proto.MessageKey.fromMe)
   return _internal_fromme();
 }
 inline void MessageKey::_internal_set_fromme(bool value) {
-  _has_bits_[0] |= 0x00000008u;
-  fromme_ = value;
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.fromme_ = value;
 }
 inline void MessageKey::set_fromme(bool value) {
   _internal_set_fromme(value);
@@ -47414,15 +49535,15 @@ inline void MessageKey::set_fromme(bool value) {
 
 // optional string id = 3;
 inline bool MessageKey::_internal_has_id() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool MessageKey::has_id() const {
   return _internal_has_id();
 }
 inline void MessageKey::clear_id() {
-  id_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.id_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& MessageKey::id() const {
   // @@protoc_insertion_point(field_get:proto.MessageKey.id)
@@ -47431,8 +49552,8 @@ inline const std::string& MessageKey::id() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void MessageKey::set_id(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- id_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.id_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.MessageKey.id)
 }
 inline std::string* MessageKey::mutable_id() {
@@ -47441,46 +49562,56 @@ inline std::string* MessageKey::mutable_id() {
   return _s;
 }
 inline const std::string& MessageKey::_internal_id() const {
-  return id_.Get();
+  return _impl_.id_.Get();
 }
 inline void MessageKey::_internal_set_id(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  id_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.id_.Set(value, GetArenaForAllocation());
 }
 inline std::string* MessageKey::_internal_mutable_id() {
-  _has_bits_[0] |= 0x00000002u;
-  return id_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.id_.Mutable(GetArenaForAllocation());
 }
 inline std::string* MessageKey::release_id() {
   // @@protoc_insertion_point(field_release:proto.MessageKey.id)
   if (!_internal_has_id()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return id_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.id_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.id_.IsDefault()) {
+    _impl_.id_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void MessageKey::set_allocated_id(std::string* id) {
   if (id != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  id_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), id,
-      GetArenaForAllocation());
+  _impl_.id_.SetAllocated(id, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.id_.IsDefault()) {
+    _impl_.id_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.MessageKey.id)
 }
 
 // optional string participant = 4;
 inline bool MessageKey::_internal_has_participant() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool MessageKey::has_participant() const {
   return _internal_has_participant();
 }
 inline void MessageKey::clear_participant() {
-  participant_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.participant_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const std::string& MessageKey::participant() const {
   // @@protoc_insertion_point(field_get:proto.MessageKey.participant)
@@ -47489,8 +49620,8 @@ inline const std::string& MessageKey::participant() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void MessageKey::set_participant(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000004u;
- participant_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000004u;
+ _impl_.participant_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.MessageKey.participant)
 }
 inline std::string* MessageKey::mutable_participant() {
@@ -47499,32 +49630,42 @@ inline std::string* MessageKey::mutable_participant() {
   return _s;
 }
 inline const std::string& MessageKey::_internal_participant() const {
-  return participant_.Get();
+  return _impl_.participant_.Get();
 }
 inline void MessageKey::_internal_set_participant(const std::string& value) {
-  _has_bits_[0] |= 0x00000004u;
-  participant_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.participant_.Set(value, GetArenaForAllocation());
 }
 inline std::string* MessageKey::_internal_mutable_participant() {
-  _has_bits_[0] |= 0x00000004u;
-  return participant_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  return _impl_.participant_.Mutable(GetArenaForAllocation());
 }
 inline std::string* MessageKey::release_participant() {
   // @@protoc_insertion_point(field_release:proto.MessageKey.participant)
   if (!_internal_has_participant()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000004u;
-  return participant_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  auto* p = _impl_.participant_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.participant_.IsDefault()) {
+    _impl_.participant_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void MessageKey::set_allocated_participant(std::string* participant) {
   if (participant != nullptr) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
+  }
+  _impl_.participant_.SetAllocated(participant, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.participant_.IsDefault()) {
+    _impl_.participant_.Set("", GetArenaForAllocation());
   }
-  participant_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), participant,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.MessageKey.participant)
 }
 
@@ -47534,18 +49675,18 @@ inline void MessageKey::set_allocated_participant(std::string* participant) {
 
 // optional .proto.WebFeatures.WebFeaturesFlag labelsDisplay = 1;
 inline bool WebFeatures::_internal_has_labelsdisplay() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool WebFeatures::has_labelsdisplay() const {
   return _internal_has_labelsdisplay();
 }
 inline void WebFeatures::clear_labelsdisplay() {
-  labelsdisplay_ = 0;
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.labelsdisplay_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_labelsdisplay() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(labelsdisplay_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.labelsdisplay_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::labelsdisplay() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.labelsDisplay)
@@ -47553,8 +49694,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::labelsdisplay() const {
 }
 inline void WebFeatures::_internal_set_labelsdisplay(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x00000001u;
-  labelsdisplay_ = value;
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.labelsdisplay_ = value;
 }
 inline void WebFeatures::set_labelsdisplay(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_labelsdisplay(value);
@@ -47563,18 +49704,18 @@ inline void WebFeatures::set_labelsdisplay(::proto::WebFeatures_WebFeaturesFlag
 
 // optional .proto.WebFeatures.WebFeaturesFlag voipIndividualOutgoing = 2;
 inline bool WebFeatures::_internal_has_voipindividualoutgoing() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool WebFeatures::has_voipindividualoutgoing() const {
   return _internal_has_voipindividualoutgoing();
 }
 inline void WebFeatures::clear_voipindividualoutgoing() {
-  voipindividualoutgoing_ = 0;
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.voipindividualoutgoing_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_voipindividualoutgoing() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(voipindividualoutgoing_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.voipindividualoutgoing_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::voipindividualoutgoing() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.voipIndividualOutgoing)
@@ -47582,8 +49723,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::voipindividualoutgoing(
 }
 inline void WebFeatures::_internal_set_voipindividualoutgoing(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x00000002u;
-  voipindividualoutgoing_ = value;
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.voipindividualoutgoing_ = value;
 }
 inline void WebFeatures::set_voipindividualoutgoing(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_voipindividualoutgoing(value);
@@ -47592,18 +49733,18 @@ inline void WebFeatures::set_voipindividualoutgoing(::proto::WebFeatures_WebFeat
 
 // optional .proto.WebFeatures.WebFeaturesFlag groupsV3 = 3;
 inline bool WebFeatures::_internal_has_groupsv3() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool WebFeatures::has_groupsv3() const {
   return _internal_has_groupsv3();
 }
 inline void WebFeatures::clear_groupsv3() {
-  groupsv3_ = 0;
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.groupsv3_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_groupsv3() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(groupsv3_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.groupsv3_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::groupsv3() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.groupsV3)
@@ -47611,8 +49752,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::groupsv3() const {
 }
 inline void WebFeatures::_internal_set_groupsv3(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x00000004u;
-  groupsv3_ = value;
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.groupsv3_ = value;
 }
 inline void WebFeatures::set_groupsv3(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_groupsv3(value);
@@ -47621,18 +49762,18 @@ inline void WebFeatures::set_groupsv3(::proto::WebFeatures_WebFeaturesFlag value
 
 // optional .proto.WebFeatures.WebFeaturesFlag groupsV3Create = 4;
 inline bool WebFeatures::_internal_has_groupsv3create() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool WebFeatures::has_groupsv3create() const {
   return _internal_has_groupsv3create();
 }
 inline void WebFeatures::clear_groupsv3create() {
-  groupsv3create_ = 0;
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.groupsv3create_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_groupsv3create() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(groupsv3create_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.groupsv3create_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::groupsv3create() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.groupsV3Create)
@@ -47640,8 +49781,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::groupsv3create() const
 }
 inline void WebFeatures::_internal_set_groupsv3create(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x00000008u;
-  groupsv3create_ = value;
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.groupsv3create_ = value;
 }
 inline void WebFeatures::set_groupsv3create(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_groupsv3create(value);
@@ -47650,18 +49791,18 @@ inline void WebFeatures::set_groupsv3create(::proto::WebFeatures_WebFeaturesFlag
 
 // optional .proto.WebFeatures.WebFeaturesFlag changeNumberV2 = 5;
 inline bool WebFeatures::_internal_has_changenumberv2() const {
-  bool value = (_has_bits_[0] & 0x00000010u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
   return value;
 }
 inline bool WebFeatures::has_changenumberv2() const {
   return _internal_has_changenumberv2();
 }
 inline void WebFeatures::clear_changenumberv2() {
-  changenumberv2_ = 0;
-  _has_bits_[0] &= ~0x00000010u;
+  _impl_.changenumberv2_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000010u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_changenumberv2() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(changenumberv2_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.changenumberv2_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::changenumberv2() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.changeNumberV2)
@@ -47669,8 +49810,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::changenumberv2() const
 }
 inline void WebFeatures::_internal_set_changenumberv2(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x00000010u;
-  changenumberv2_ = value;
+  _impl_._has_bits_[0] |= 0x00000010u;
+  _impl_.changenumberv2_ = value;
 }
 inline void WebFeatures::set_changenumberv2(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_changenumberv2(value);
@@ -47679,18 +49820,18 @@ inline void WebFeatures::set_changenumberv2(::proto::WebFeatures_WebFeaturesFlag
 
 // optional .proto.WebFeatures.WebFeaturesFlag queryStatusV3Thumbnail = 6;
 inline bool WebFeatures::_internal_has_querystatusv3thumbnail() const {
-  bool value = (_has_bits_[0] & 0x00000020u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
   return value;
 }
 inline bool WebFeatures::has_querystatusv3thumbnail() const {
   return _internal_has_querystatusv3thumbnail();
 }
 inline void WebFeatures::clear_querystatusv3thumbnail() {
-  querystatusv3thumbnail_ = 0;
-  _has_bits_[0] &= ~0x00000020u;
+  _impl_.querystatusv3thumbnail_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000020u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_querystatusv3thumbnail() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(querystatusv3thumbnail_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.querystatusv3thumbnail_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::querystatusv3thumbnail() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.queryStatusV3Thumbnail)
@@ -47698,8 +49839,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::querystatusv3thumbnail(
 }
 inline void WebFeatures::_internal_set_querystatusv3thumbnail(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x00000020u;
-  querystatusv3thumbnail_ = value;
+  _impl_._has_bits_[0] |= 0x00000020u;
+  _impl_.querystatusv3thumbnail_ = value;
 }
 inline void WebFeatures::set_querystatusv3thumbnail(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_querystatusv3thumbnail(value);
@@ -47708,18 +49849,18 @@ inline void WebFeatures::set_querystatusv3thumbnail(::proto::WebFeatures_WebFeat
 
 // optional .proto.WebFeatures.WebFeaturesFlag liveLocations = 7;
 inline bool WebFeatures::_internal_has_livelocations() const {
-  bool value = (_has_bits_[0] & 0x00000040u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
   return value;
 }
 inline bool WebFeatures::has_livelocations() const {
   return _internal_has_livelocations();
 }
 inline void WebFeatures::clear_livelocations() {
-  livelocations_ = 0;
-  _has_bits_[0] &= ~0x00000040u;
+  _impl_.livelocations_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000040u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_livelocations() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(livelocations_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.livelocations_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::livelocations() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.liveLocations)
@@ -47727,8 +49868,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::livelocations() const {
 }
 inline void WebFeatures::_internal_set_livelocations(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x00000040u;
-  livelocations_ = value;
+  _impl_._has_bits_[0] |= 0x00000040u;
+  _impl_.livelocations_ = value;
 }
 inline void WebFeatures::set_livelocations(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_livelocations(value);
@@ -47737,18 +49878,18 @@ inline void WebFeatures::set_livelocations(::proto::WebFeatures_WebFeaturesFlag
 
 // optional .proto.WebFeatures.WebFeaturesFlag queryVname = 8;
 inline bool WebFeatures::_internal_has_queryvname() const {
-  bool value = (_has_bits_[0] & 0x00000080u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000080u) != 0;
   return value;
 }
 inline bool WebFeatures::has_queryvname() const {
   return _internal_has_queryvname();
 }
 inline void WebFeatures::clear_queryvname() {
-  queryvname_ = 0;
-  _has_bits_[0] &= ~0x00000080u;
+  _impl_.queryvname_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000080u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_queryvname() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(queryvname_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.queryvname_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::queryvname() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.queryVname)
@@ -47756,8 +49897,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::queryvname() const {
 }
 inline void WebFeatures::_internal_set_queryvname(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x00000080u;
-  queryvname_ = value;
+  _impl_._has_bits_[0] |= 0x00000080u;
+  _impl_.queryvname_ = value;
 }
 inline void WebFeatures::set_queryvname(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_queryvname(value);
@@ -47766,18 +49907,18 @@ inline void WebFeatures::set_queryvname(::proto::WebFeatures_WebFeaturesFlag val
 
 // optional .proto.WebFeatures.WebFeaturesFlag voipIndividualIncoming = 9;
 inline bool WebFeatures::_internal_has_voipindividualincoming() const {
-  bool value = (_has_bits_[0] & 0x00000100u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000100u) != 0;
   return value;
 }
 inline bool WebFeatures::has_voipindividualincoming() const {
   return _internal_has_voipindividualincoming();
 }
 inline void WebFeatures::clear_voipindividualincoming() {
-  voipindividualincoming_ = 0;
-  _has_bits_[0] &= ~0x00000100u;
+  _impl_.voipindividualincoming_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000100u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_voipindividualincoming() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(voipindividualincoming_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.voipindividualincoming_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::voipindividualincoming() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.voipIndividualIncoming)
@@ -47785,8 +49926,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::voipindividualincoming(
 }
 inline void WebFeatures::_internal_set_voipindividualincoming(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x00000100u;
-  voipindividualincoming_ = value;
+  _impl_._has_bits_[0] |= 0x00000100u;
+  _impl_.voipindividualincoming_ = value;
 }
 inline void WebFeatures::set_voipindividualincoming(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_voipindividualincoming(value);
@@ -47795,18 +49936,18 @@ inline void WebFeatures::set_voipindividualincoming(::proto::WebFeatures_WebFeat
 
 // optional .proto.WebFeatures.WebFeaturesFlag quickRepliesQuery = 10;
 inline bool WebFeatures::_internal_has_quickrepliesquery() const {
-  bool value = (_has_bits_[0] & 0x00000200u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000200u) != 0;
   return value;
 }
 inline bool WebFeatures::has_quickrepliesquery() const {
   return _internal_has_quickrepliesquery();
 }
 inline void WebFeatures::clear_quickrepliesquery() {
-  quickrepliesquery_ = 0;
-  _has_bits_[0] &= ~0x00000200u;
+  _impl_.quickrepliesquery_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000200u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_quickrepliesquery() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(quickrepliesquery_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.quickrepliesquery_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::quickrepliesquery() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.quickRepliesQuery)
@@ -47814,8 +49955,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::quickrepliesquery() con
 }
 inline void WebFeatures::_internal_set_quickrepliesquery(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x00000200u;
-  quickrepliesquery_ = value;
+  _impl_._has_bits_[0] |= 0x00000200u;
+  _impl_.quickrepliesquery_ = value;
 }
 inline void WebFeatures::set_quickrepliesquery(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_quickrepliesquery(value);
@@ -47824,18 +49965,18 @@ inline void WebFeatures::set_quickrepliesquery(::proto::WebFeatures_WebFeaturesF
 
 // optional .proto.WebFeatures.WebFeaturesFlag payments = 11;
 inline bool WebFeatures::_internal_has_payments() const {
-  bool value = (_has_bits_[0] & 0x00000400u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000400u) != 0;
   return value;
 }
 inline bool WebFeatures::has_payments() const {
   return _internal_has_payments();
 }
 inline void WebFeatures::clear_payments() {
-  payments_ = 0;
-  _has_bits_[0] &= ~0x00000400u;
+  _impl_.payments_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000400u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_payments() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(payments_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.payments_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::payments() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.payments)
@@ -47843,8 +49984,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::payments() const {
 }
 inline void WebFeatures::_internal_set_payments(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x00000400u;
-  payments_ = value;
+  _impl_._has_bits_[0] |= 0x00000400u;
+  _impl_.payments_ = value;
 }
 inline void WebFeatures::set_payments(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_payments(value);
@@ -47853,18 +49994,18 @@ inline void WebFeatures::set_payments(::proto::WebFeatures_WebFeaturesFlag value
 
 // optional .proto.WebFeatures.WebFeaturesFlag stickerPackQuery = 12;
 inline bool WebFeatures::_internal_has_stickerpackquery() const {
-  bool value = (_has_bits_[0] & 0x00000800u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000800u) != 0;
   return value;
 }
 inline bool WebFeatures::has_stickerpackquery() const {
   return _internal_has_stickerpackquery();
 }
 inline void WebFeatures::clear_stickerpackquery() {
-  stickerpackquery_ = 0;
-  _has_bits_[0] &= ~0x00000800u;
+  _impl_.stickerpackquery_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000800u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_stickerpackquery() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(stickerpackquery_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.stickerpackquery_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::stickerpackquery() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.stickerPackQuery)
@@ -47872,8 +50013,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::stickerpackquery() cons
 }
 inline void WebFeatures::_internal_set_stickerpackquery(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x00000800u;
-  stickerpackquery_ = value;
+  _impl_._has_bits_[0] |= 0x00000800u;
+  _impl_.stickerpackquery_ = value;
 }
 inline void WebFeatures::set_stickerpackquery(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_stickerpackquery(value);
@@ -47882,18 +50023,18 @@ inline void WebFeatures::set_stickerpackquery(::proto::WebFeatures_WebFeaturesFl
 
 // optional .proto.WebFeatures.WebFeaturesFlag liveLocationsFinal = 13;
 inline bool WebFeatures::_internal_has_livelocationsfinal() const {
-  bool value = (_has_bits_[0] & 0x00001000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00001000u) != 0;
   return value;
 }
 inline bool WebFeatures::has_livelocationsfinal() const {
   return _internal_has_livelocationsfinal();
 }
 inline void WebFeatures::clear_livelocationsfinal() {
-  livelocationsfinal_ = 0;
-  _has_bits_[0] &= ~0x00001000u;
+  _impl_.livelocationsfinal_ = 0;
+  _impl_._has_bits_[0] &= ~0x00001000u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_livelocationsfinal() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(livelocationsfinal_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.livelocationsfinal_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::livelocationsfinal() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.liveLocationsFinal)
@@ -47901,8 +50042,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::livelocationsfinal() co
 }
 inline void WebFeatures::_internal_set_livelocationsfinal(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x00001000u;
-  livelocationsfinal_ = value;
+  _impl_._has_bits_[0] |= 0x00001000u;
+  _impl_.livelocationsfinal_ = value;
 }
 inline void WebFeatures::set_livelocationsfinal(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_livelocationsfinal(value);
@@ -47911,18 +50052,18 @@ inline void WebFeatures::set_livelocationsfinal(::proto::WebFeatures_WebFeatures
 
 // optional .proto.WebFeatures.WebFeaturesFlag labelsEdit = 14;
 inline bool WebFeatures::_internal_has_labelsedit() const {
-  bool value = (_has_bits_[0] & 0x00002000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00002000u) != 0;
   return value;
 }
 inline bool WebFeatures::has_labelsedit() const {
   return _internal_has_labelsedit();
 }
 inline void WebFeatures::clear_labelsedit() {
-  labelsedit_ = 0;
-  _has_bits_[0] &= ~0x00002000u;
+  _impl_.labelsedit_ = 0;
+  _impl_._has_bits_[0] &= ~0x00002000u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_labelsedit() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(labelsedit_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.labelsedit_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::labelsedit() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.labelsEdit)
@@ -47930,8 +50071,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::labelsedit() const {
 }
 inline void WebFeatures::_internal_set_labelsedit(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x00002000u;
-  labelsedit_ = value;
+  _impl_._has_bits_[0] |= 0x00002000u;
+  _impl_.labelsedit_ = value;
 }
 inline void WebFeatures::set_labelsedit(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_labelsedit(value);
@@ -47940,18 +50081,18 @@ inline void WebFeatures::set_labelsedit(::proto::WebFeatures_WebFeaturesFlag val
 
 // optional .proto.WebFeatures.WebFeaturesFlag mediaUpload = 15;
 inline bool WebFeatures::_internal_has_mediaupload() const {
-  bool value = (_has_bits_[0] & 0x00004000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00004000u) != 0;
   return value;
 }
 inline bool WebFeatures::has_mediaupload() const {
   return _internal_has_mediaupload();
 }
 inline void WebFeatures::clear_mediaupload() {
-  mediaupload_ = 0;
-  _has_bits_[0] &= ~0x00004000u;
+  _impl_.mediaupload_ = 0;
+  _impl_._has_bits_[0] &= ~0x00004000u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_mediaupload() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(mediaupload_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.mediaupload_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::mediaupload() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.mediaUpload)
@@ -47959,8 +50100,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::mediaupload() const {
 }
 inline void WebFeatures::_internal_set_mediaupload(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x00004000u;
-  mediaupload_ = value;
+  _impl_._has_bits_[0] |= 0x00004000u;
+  _impl_.mediaupload_ = value;
 }
 inline void WebFeatures::set_mediaupload(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_mediaupload(value);
@@ -47969,18 +50110,18 @@ inline void WebFeatures::set_mediaupload(::proto::WebFeatures_WebFeaturesFlag va
 
 // optional .proto.WebFeatures.WebFeaturesFlag mediaUploadRichQuickReplies = 18;
 inline bool WebFeatures::_internal_has_mediauploadrichquickreplies() const {
-  bool value = (_has_bits_[0] & 0x00008000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00008000u) != 0;
   return value;
 }
 inline bool WebFeatures::has_mediauploadrichquickreplies() const {
   return _internal_has_mediauploadrichquickreplies();
 }
 inline void WebFeatures::clear_mediauploadrichquickreplies() {
-  mediauploadrichquickreplies_ = 0;
-  _has_bits_[0] &= ~0x00008000u;
+  _impl_.mediauploadrichquickreplies_ = 0;
+  _impl_._has_bits_[0] &= ~0x00008000u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_mediauploadrichquickreplies() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(mediauploadrichquickreplies_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.mediauploadrichquickreplies_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::mediauploadrichquickreplies() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.mediaUploadRichQuickReplies)
@@ -47988,8 +50129,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::mediauploadrichquickrep
 }
 inline void WebFeatures::_internal_set_mediauploadrichquickreplies(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x00008000u;
-  mediauploadrichquickreplies_ = value;
+  _impl_._has_bits_[0] |= 0x00008000u;
+  _impl_.mediauploadrichquickreplies_ = value;
 }
 inline void WebFeatures::set_mediauploadrichquickreplies(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_mediauploadrichquickreplies(value);
@@ -47998,18 +50139,18 @@ inline void WebFeatures::set_mediauploadrichquickreplies(::proto::WebFeatures_We
 
 // optional .proto.WebFeatures.WebFeaturesFlag vnameV2 = 19;
 inline bool WebFeatures::_internal_has_vnamev2() const {
-  bool value = (_has_bits_[0] & 0x00010000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00010000u) != 0;
   return value;
 }
 inline bool WebFeatures::has_vnamev2() const {
   return _internal_has_vnamev2();
 }
 inline void WebFeatures::clear_vnamev2() {
-  vnamev2_ = 0;
-  _has_bits_[0] &= ~0x00010000u;
+  _impl_.vnamev2_ = 0;
+  _impl_._has_bits_[0] &= ~0x00010000u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_vnamev2() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(vnamev2_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.vnamev2_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::vnamev2() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.vnameV2)
@@ -48017,8 +50158,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::vnamev2() const {
 }
 inline void WebFeatures::_internal_set_vnamev2(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x00010000u;
-  vnamev2_ = value;
+  _impl_._has_bits_[0] |= 0x00010000u;
+  _impl_.vnamev2_ = value;
 }
 inline void WebFeatures::set_vnamev2(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_vnamev2(value);
@@ -48027,18 +50168,18 @@ inline void WebFeatures::set_vnamev2(::proto::WebFeatures_WebFeaturesFlag value)
 
 // optional .proto.WebFeatures.WebFeaturesFlag videoPlaybackUrl = 20;
 inline bool WebFeatures::_internal_has_videoplaybackurl() const {
-  bool value = (_has_bits_[0] & 0x00020000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00020000u) != 0;
   return value;
 }
 inline bool WebFeatures::has_videoplaybackurl() const {
   return _internal_has_videoplaybackurl();
 }
 inline void WebFeatures::clear_videoplaybackurl() {
-  videoplaybackurl_ = 0;
-  _has_bits_[0] &= ~0x00020000u;
+  _impl_.videoplaybackurl_ = 0;
+  _impl_._has_bits_[0] &= ~0x00020000u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_videoplaybackurl() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(videoplaybackurl_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.videoplaybackurl_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::videoplaybackurl() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.videoPlaybackUrl)
@@ -48046,8 +50187,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::videoplaybackurl() cons
 }
 inline void WebFeatures::_internal_set_videoplaybackurl(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x00020000u;
-  videoplaybackurl_ = value;
+  _impl_._has_bits_[0] |= 0x00020000u;
+  _impl_.videoplaybackurl_ = value;
 }
 inline void WebFeatures::set_videoplaybackurl(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_videoplaybackurl(value);
@@ -48056,18 +50197,18 @@ inline void WebFeatures::set_videoplaybackurl(::proto::WebFeatures_WebFeaturesFl
 
 // optional .proto.WebFeatures.WebFeaturesFlag statusRanking = 21;
 inline bool WebFeatures::_internal_has_statusranking() const {
-  bool value = (_has_bits_[0] & 0x00040000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00040000u) != 0;
   return value;
 }
 inline bool WebFeatures::has_statusranking() const {
   return _internal_has_statusranking();
 }
 inline void WebFeatures::clear_statusranking() {
-  statusranking_ = 0;
-  _has_bits_[0] &= ~0x00040000u;
+  _impl_.statusranking_ = 0;
+  _impl_._has_bits_[0] &= ~0x00040000u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_statusranking() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(statusranking_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.statusranking_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::statusranking() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.statusRanking)
@@ -48075,8 +50216,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::statusranking() const {
 }
 inline void WebFeatures::_internal_set_statusranking(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x00040000u;
-  statusranking_ = value;
+  _impl_._has_bits_[0] |= 0x00040000u;
+  _impl_.statusranking_ = value;
 }
 inline void WebFeatures::set_statusranking(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_statusranking(value);
@@ -48085,18 +50226,18 @@ inline void WebFeatures::set_statusranking(::proto::WebFeatures_WebFeaturesFlag
 
 // optional .proto.WebFeatures.WebFeaturesFlag voipIndividualVideo = 22;
 inline bool WebFeatures::_internal_has_voipindividualvideo() const {
-  bool value = (_has_bits_[0] & 0x00080000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00080000u) != 0;
   return value;
 }
 inline bool WebFeatures::has_voipindividualvideo() const {
   return _internal_has_voipindividualvideo();
 }
 inline void WebFeatures::clear_voipindividualvideo() {
-  voipindividualvideo_ = 0;
-  _has_bits_[0] &= ~0x00080000u;
+  _impl_.voipindividualvideo_ = 0;
+  _impl_._has_bits_[0] &= ~0x00080000u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_voipindividualvideo() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(voipindividualvideo_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.voipindividualvideo_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::voipindividualvideo() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.voipIndividualVideo)
@@ -48104,8 +50245,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::voipindividualvideo() c
 }
 inline void WebFeatures::_internal_set_voipindividualvideo(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x00080000u;
-  voipindividualvideo_ = value;
+  _impl_._has_bits_[0] |= 0x00080000u;
+  _impl_.voipindividualvideo_ = value;
 }
 inline void WebFeatures::set_voipindividualvideo(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_voipindividualvideo(value);
@@ -48114,18 +50255,18 @@ inline void WebFeatures::set_voipindividualvideo(::proto::WebFeatures_WebFeature
 
 // optional .proto.WebFeatures.WebFeaturesFlag thirdPartyStickers = 23;
 inline bool WebFeatures::_internal_has_thirdpartystickers() const {
-  bool value = (_has_bits_[0] & 0x00100000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00100000u) != 0;
   return value;
 }
 inline bool WebFeatures::has_thirdpartystickers() const {
   return _internal_has_thirdpartystickers();
 }
 inline void WebFeatures::clear_thirdpartystickers() {
-  thirdpartystickers_ = 0;
-  _has_bits_[0] &= ~0x00100000u;
+  _impl_.thirdpartystickers_ = 0;
+  _impl_._has_bits_[0] &= ~0x00100000u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_thirdpartystickers() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(thirdpartystickers_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.thirdpartystickers_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::thirdpartystickers() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.thirdPartyStickers)
@@ -48133,8 +50274,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::thirdpartystickers() co
 }
 inline void WebFeatures::_internal_set_thirdpartystickers(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x00100000u;
-  thirdpartystickers_ = value;
+  _impl_._has_bits_[0] |= 0x00100000u;
+  _impl_.thirdpartystickers_ = value;
 }
 inline void WebFeatures::set_thirdpartystickers(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_thirdpartystickers(value);
@@ -48143,18 +50284,18 @@ inline void WebFeatures::set_thirdpartystickers(::proto::WebFeatures_WebFeatures
 
 // optional .proto.WebFeatures.WebFeaturesFlag frequentlyForwardedSetting = 24;
 inline bool WebFeatures::_internal_has_frequentlyforwardedsetting() const {
-  bool value = (_has_bits_[0] & 0x00200000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00200000u) != 0;
   return value;
 }
 inline bool WebFeatures::has_frequentlyforwardedsetting() const {
   return _internal_has_frequentlyforwardedsetting();
 }
 inline void WebFeatures::clear_frequentlyforwardedsetting() {
-  frequentlyforwardedsetting_ = 0;
-  _has_bits_[0] &= ~0x00200000u;
+  _impl_.frequentlyforwardedsetting_ = 0;
+  _impl_._has_bits_[0] &= ~0x00200000u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_frequentlyforwardedsetting() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(frequentlyforwardedsetting_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.frequentlyforwardedsetting_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::frequentlyforwardedsetting() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.frequentlyForwardedSetting)
@@ -48162,8 +50303,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::frequentlyforwardedsett
 }
 inline void WebFeatures::_internal_set_frequentlyforwardedsetting(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x00200000u;
-  frequentlyforwardedsetting_ = value;
+  _impl_._has_bits_[0] |= 0x00200000u;
+  _impl_.frequentlyforwardedsetting_ = value;
 }
 inline void WebFeatures::set_frequentlyforwardedsetting(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_frequentlyforwardedsetting(value);
@@ -48172,18 +50313,18 @@ inline void WebFeatures::set_frequentlyforwardedsetting(::proto::WebFeatures_Web
 
 // optional .proto.WebFeatures.WebFeaturesFlag groupsV4JoinPermission = 25;
 inline bool WebFeatures::_internal_has_groupsv4joinpermission() const {
-  bool value = (_has_bits_[0] & 0x00400000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00400000u) != 0;
   return value;
 }
 inline bool WebFeatures::has_groupsv4joinpermission() const {
   return _internal_has_groupsv4joinpermission();
 }
 inline void WebFeatures::clear_groupsv4joinpermission() {
-  groupsv4joinpermission_ = 0;
-  _has_bits_[0] &= ~0x00400000u;
+  _impl_.groupsv4joinpermission_ = 0;
+  _impl_._has_bits_[0] &= ~0x00400000u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_groupsv4joinpermission() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(groupsv4joinpermission_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.groupsv4joinpermission_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::groupsv4joinpermission() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.groupsV4JoinPermission)
@@ -48191,8 +50332,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::groupsv4joinpermission(
 }
 inline void WebFeatures::_internal_set_groupsv4joinpermission(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x00400000u;
-  groupsv4joinpermission_ = value;
+  _impl_._has_bits_[0] |= 0x00400000u;
+  _impl_.groupsv4joinpermission_ = value;
 }
 inline void WebFeatures::set_groupsv4joinpermission(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_groupsv4joinpermission(value);
@@ -48201,18 +50342,18 @@ inline void WebFeatures::set_groupsv4joinpermission(::proto::WebFeatures_WebFeat
 
 // optional .proto.WebFeatures.WebFeaturesFlag recentStickers = 26;
 inline bool WebFeatures::_internal_has_recentstickers() const {
-  bool value = (_has_bits_[0] & 0x00800000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00800000u) != 0;
   return value;
 }
 inline bool WebFeatures::has_recentstickers() const {
   return _internal_has_recentstickers();
 }
 inline void WebFeatures::clear_recentstickers() {
-  recentstickers_ = 0;
-  _has_bits_[0] &= ~0x00800000u;
+  _impl_.recentstickers_ = 0;
+  _impl_._has_bits_[0] &= ~0x00800000u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_recentstickers() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(recentstickers_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.recentstickers_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::recentstickers() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.recentStickers)
@@ -48220,8 +50361,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::recentstickers() const
 }
 inline void WebFeatures::_internal_set_recentstickers(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x00800000u;
-  recentstickers_ = value;
+  _impl_._has_bits_[0] |= 0x00800000u;
+  _impl_.recentstickers_ = value;
 }
 inline void WebFeatures::set_recentstickers(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_recentstickers(value);
@@ -48230,18 +50371,18 @@ inline void WebFeatures::set_recentstickers(::proto::WebFeatures_WebFeaturesFlag
 
 // optional .proto.WebFeatures.WebFeaturesFlag catalog = 27;
 inline bool WebFeatures::_internal_has_catalog() const {
-  bool value = (_has_bits_[0] & 0x01000000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x01000000u) != 0;
   return value;
 }
 inline bool WebFeatures::has_catalog() const {
   return _internal_has_catalog();
 }
 inline void WebFeatures::clear_catalog() {
-  catalog_ = 0;
-  _has_bits_[0] &= ~0x01000000u;
+  _impl_.catalog_ = 0;
+  _impl_._has_bits_[0] &= ~0x01000000u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_catalog() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(catalog_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.catalog_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::catalog() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.catalog)
@@ -48249,8 +50390,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::catalog() const {
 }
 inline void WebFeatures::_internal_set_catalog(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x01000000u;
-  catalog_ = value;
+  _impl_._has_bits_[0] |= 0x01000000u;
+  _impl_.catalog_ = value;
 }
 inline void WebFeatures::set_catalog(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_catalog(value);
@@ -48259,18 +50400,18 @@ inline void WebFeatures::set_catalog(::proto::WebFeatures_WebFeaturesFlag value)
 
 // optional .proto.WebFeatures.WebFeaturesFlag starredStickers = 28;
 inline bool WebFeatures::_internal_has_starredstickers() const {
-  bool value = (_has_bits_[0] & 0x02000000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x02000000u) != 0;
   return value;
 }
 inline bool WebFeatures::has_starredstickers() const {
   return _internal_has_starredstickers();
 }
 inline void WebFeatures::clear_starredstickers() {
-  starredstickers_ = 0;
-  _has_bits_[0] &= ~0x02000000u;
+  _impl_.starredstickers_ = 0;
+  _impl_._has_bits_[0] &= ~0x02000000u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_starredstickers() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(starredstickers_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.starredstickers_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::starredstickers() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.starredStickers)
@@ -48278,8 +50419,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::starredstickers() const
 }
 inline void WebFeatures::_internal_set_starredstickers(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x02000000u;
-  starredstickers_ = value;
+  _impl_._has_bits_[0] |= 0x02000000u;
+  _impl_.starredstickers_ = value;
 }
 inline void WebFeatures::set_starredstickers(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_starredstickers(value);
@@ -48288,18 +50429,18 @@ inline void WebFeatures::set_starredstickers(::proto::WebFeatures_WebFeaturesFla
 
 // optional .proto.WebFeatures.WebFeaturesFlag voipGroupCall = 29;
 inline bool WebFeatures::_internal_has_voipgroupcall() const {
-  bool value = (_has_bits_[0] & 0x04000000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x04000000u) != 0;
   return value;
 }
 inline bool WebFeatures::has_voipgroupcall() const {
   return _internal_has_voipgroupcall();
 }
 inline void WebFeatures::clear_voipgroupcall() {
-  voipgroupcall_ = 0;
-  _has_bits_[0] &= ~0x04000000u;
+  _impl_.voipgroupcall_ = 0;
+  _impl_._has_bits_[0] &= ~0x04000000u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_voipgroupcall() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(voipgroupcall_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.voipgroupcall_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::voipgroupcall() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.voipGroupCall)
@@ -48307,8 +50448,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::voipgroupcall() const {
 }
 inline void WebFeatures::_internal_set_voipgroupcall(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x04000000u;
-  voipgroupcall_ = value;
+  _impl_._has_bits_[0] |= 0x04000000u;
+  _impl_.voipgroupcall_ = value;
 }
 inline void WebFeatures::set_voipgroupcall(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_voipgroupcall(value);
@@ -48317,18 +50458,18 @@ inline void WebFeatures::set_voipgroupcall(::proto::WebFeatures_WebFeaturesFlag
 
 // optional .proto.WebFeatures.WebFeaturesFlag templateMessage = 30;
 inline bool WebFeatures::_internal_has_templatemessage() const {
-  bool value = (_has_bits_[0] & 0x08000000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x08000000u) != 0;
   return value;
 }
 inline bool WebFeatures::has_templatemessage() const {
   return _internal_has_templatemessage();
 }
 inline void WebFeatures::clear_templatemessage() {
-  templatemessage_ = 0;
-  _has_bits_[0] &= ~0x08000000u;
+  _impl_.templatemessage_ = 0;
+  _impl_._has_bits_[0] &= ~0x08000000u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_templatemessage() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(templatemessage_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.templatemessage_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::templatemessage() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.templateMessage)
@@ -48336,8 +50477,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::templatemessage() const
 }
 inline void WebFeatures::_internal_set_templatemessage(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x08000000u;
-  templatemessage_ = value;
+  _impl_._has_bits_[0] |= 0x08000000u;
+  _impl_.templatemessage_ = value;
 }
 inline void WebFeatures::set_templatemessage(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_templatemessage(value);
@@ -48346,18 +50487,18 @@ inline void WebFeatures::set_templatemessage(::proto::WebFeatures_WebFeaturesFla
 
 // optional .proto.WebFeatures.WebFeaturesFlag templateMessageInteractivity = 31;
 inline bool WebFeatures::_internal_has_templatemessageinteractivity() const {
-  bool value = (_has_bits_[0] & 0x10000000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x10000000u) != 0;
   return value;
 }
 inline bool WebFeatures::has_templatemessageinteractivity() const {
   return _internal_has_templatemessageinteractivity();
 }
 inline void WebFeatures::clear_templatemessageinteractivity() {
-  templatemessageinteractivity_ = 0;
-  _has_bits_[0] &= ~0x10000000u;
+  _impl_.templatemessageinteractivity_ = 0;
+  _impl_._has_bits_[0] &= ~0x10000000u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_templatemessageinteractivity() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(templatemessageinteractivity_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.templatemessageinteractivity_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::templatemessageinteractivity() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.templateMessageInteractivity)
@@ -48365,8 +50506,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::templatemessageinteract
 }
 inline void WebFeatures::_internal_set_templatemessageinteractivity(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x10000000u;
-  templatemessageinteractivity_ = value;
+  _impl_._has_bits_[0] |= 0x10000000u;
+  _impl_.templatemessageinteractivity_ = value;
 }
 inline void WebFeatures::set_templatemessageinteractivity(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_templatemessageinteractivity(value);
@@ -48375,18 +50516,18 @@ inline void WebFeatures::set_templatemessageinteractivity(::proto::WebFeatures_W
 
 // optional .proto.WebFeatures.WebFeaturesFlag ephemeralMessages = 32;
 inline bool WebFeatures::_internal_has_ephemeralmessages() const {
-  bool value = (_has_bits_[0] & 0x20000000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x20000000u) != 0;
   return value;
 }
 inline bool WebFeatures::has_ephemeralmessages() const {
   return _internal_has_ephemeralmessages();
 }
 inline void WebFeatures::clear_ephemeralmessages() {
-  ephemeralmessages_ = 0;
-  _has_bits_[0] &= ~0x20000000u;
+  _impl_.ephemeralmessages_ = 0;
+  _impl_._has_bits_[0] &= ~0x20000000u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_ephemeralmessages() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(ephemeralmessages_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.ephemeralmessages_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::ephemeralmessages() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.ephemeralMessages)
@@ -48394,8 +50535,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::ephemeralmessages() con
 }
 inline void WebFeatures::_internal_set_ephemeralmessages(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x20000000u;
-  ephemeralmessages_ = value;
+  _impl_._has_bits_[0] |= 0x20000000u;
+  _impl_.ephemeralmessages_ = value;
 }
 inline void WebFeatures::set_ephemeralmessages(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_ephemeralmessages(value);
@@ -48404,18 +50545,18 @@ inline void WebFeatures::set_ephemeralmessages(::proto::WebFeatures_WebFeaturesF
 
 // optional .proto.WebFeatures.WebFeaturesFlag e2ENotificationSync = 33;
 inline bool WebFeatures::_internal_has_e2enotificationsync() const {
-  bool value = (_has_bits_[0] & 0x40000000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x40000000u) != 0;
   return value;
 }
 inline bool WebFeatures::has_e2enotificationsync() const {
   return _internal_has_e2enotificationsync();
 }
 inline void WebFeatures::clear_e2enotificationsync() {
-  e2enotificationsync_ = 0;
-  _has_bits_[0] &= ~0x40000000u;
+  _impl_.e2enotificationsync_ = 0;
+  _impl_._has_bits_[0] &= ~0x40000000u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_e2enotificationsync() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(e2enotificationsync_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.e2enotificationsync_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::e2enotificationsync() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.e2ENotificationSync)
@@ -48423,8 +50564,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::e2enotificationsync() c
 }
 inline void WebFeatures::_internal_set_e2enotificationsync(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x40000000u;
-  e2enotificationsync_ = value;
+  _impl_._has_bits_[0] |= 0x40000000u;
+  _impl_.e2enotificationsync_ = value;
 }
 inline void WebFeatures::set_e2enotificationsync(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_e2enotificationsync(value);
@@ -48433,18 +50574,18 @@ inline void WebFeatures::set_e2enotificationsync(::proto::WebFeatures_WebFeature
 
 // optional .proto.WebFeatures.WebFeaturesFlag recentStickersV2 = 34;
 inline bool WebFeatures::_internal_has_recentstickersv2() const {
-  bool value = (_has_bits_[0] & 0x80000000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x80000000u) != 0;
   return value;
 }
 inline bool WebFeatures::has_recentstickersv2() const {
   return _internal_has_recentstickersv2();
 }
 inline void WebFeatures::clear_recentstickersv2() {
-  recentstickersv2_ = 0;
-  _has_bits_[0] &= ~0x80000000u;
+  _impl_.recentstickersv2_ = 0;
+  _impl_._has_bits_[0] &= ~0x80000000u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_recentstickersv2() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(recentstickersv2_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.recentstickersv2_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::recentstickersv2() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.recentStickersV2)
@@ -48452,8 +50593,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::recentstickersv2() cons
 }
 inline void WebFeatures::_internal_set_recentstickersv2(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[0] |= 0x80000000u;
-  recentstickersv2_ = value;
+  _impl_._has_bits_[0] |= 0x80000000u;
+  _impl_.recentstickersv2_ = value;
 }
 inline void WebFeatures::set_recentstickersv2(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_recentstickersv2(value);
@@ -48462,18 +50603,18 @@ inline void WebFeatures::set_recentstickersv2(::proto::WebFeatures_WebFeaturesFl
 
 // optional .proto.WebFeatures.WebFeaturesFlag syncdRelease1 = 35;
 inline bool WebFeatures::_internal_has_syncdrelease1() const {
-  bool value = (_has_bits_[1] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[1] & 0x00000001u) != 0;
   return value;
 }
 inline bool WebFeatures::has_syncdrelease1() const {
   return _internal_has_syncdrelease1();
 }
 inline void WebFeatures::clear_syncdrelease1() {
-  syncdrelease1_ = 0;
-  _has_bits_[1] &= ~0x00000001u;
+  _impl_.syncdrelease1_ = 0;
+  _impl_._has_bits_[1] &= ~0x00000001u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_syncdrelease1() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(syncdrelease1_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.syncdrelease1_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::syncdrelease1() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.syncdRelease1)
@@ -48481,8 +50622,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::syncdrelease1() const {
 }
 inline void WebFeatures::_internal_set_syncdrelease1(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[1] |= 0x00000001u;
-  syncdrelease1_ = value;
+  _impl_._has_bits_[1] |= 0x00000001u;
+  _impl_.syncdrelease1_ = value;
 }
 inline void WebFeatures::set_syncdrelease1(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_syncdrelease1(value);
@@ -48491,18 +50632,18 @@ inline void WebFeatures::set_syncdrelease1(::proto::WebFeatures_WebFeaturesFlag
 
 // optional .proto.WebFeatures.WebFeaturesFlag recentStickersV3 = 36;
 inline bool WebFeatures::_internal_has_recentstickersv3() const {
-  bool value = (_has_bits_[1] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[1] & 0x00000002u) != 0;
   return value;
 }
 inline bool WebFeatures::has_recentstickersv3() const {
   return _internal_has_recentstickersv3();
 }
 inline void WebFeatures::clear_recentstickersv3() {
-  recentstickersv3_ = 0;
-  _has_bits_[1] &= ~0x00000002u;
+  _impl_.recentstickersv3_ = 0;
+  _impl_._has_bits_[1] &= ~0x00000002u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_recentstickersv3() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(recentstickersv3_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.recentstickersv3_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::recentstickersv3() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.recentStickersV3)
@@ -48510,8 +50651,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::recentstickersv3() cons
 }
 inline void WebFeatures::_internal_set_recentstickersv3(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[1] |= 0x00000002u;
-  recentstickersv3_ = value;
+  _impl_._has_bits_[1] |= 0x00000002u;
+  _impl_.recentstickersv3_ = value;
 }
 inline void WebFeatures::set_recentstickersv3(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_recentstickersv3(value);
@@ -48520,18 +50661,18 @@ inline void WebFeatures::set_recentstickersv3(::proto::WebFeatures_WebFeaturesFl
 
 // optional .proto.WebFeatures.WebFeaturesFlag userNotice = 37;
 inline bool WebFeatures::_internal_has_usernotice() const {
-  bool value = (_has_bits_[1] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[1] & 0x00000004u) != 0;
   return value;
 }
 inline bool WebFeatures::has_usernotice() const {
   return _internal_has_usernotice();
 }
 inline void WebFeatures::clear_usernotice() {
-  usernotice_ = 0;
-  _has_bits_[1] &= ~0x00000004u;
+  _impl_.usernotice_ = 0;
+  _impl_._has_bits_[1] &= ~0x00000004u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_usernotice() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(usernotice_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.usernotice_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::usernotice() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.userNotice)
@@ -48539,8 +50680,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::usernotice() const {
 }
 inline void WebFeatures::_internal_set_usernotice(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[1] |= 0x00000004u;
-  usernotice_ = value;
+  _impl_._has_bits_[1] |= 0x00000004u;
+  _impl_.usernotice_ = value;
 }
 inline void WebFeatures::set_usernotice(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_usernotice(value);
@@ -48549,18 +50690,18 @@ inline void WebFeatures::set_usernotice(::proto::WebFeatures_WebFeaturesFlag val
 
 // optional .proto.WebFeatures.WebFeaturesFlag syncdRelease11 = 38;
 inline bool WebFeatures::_internal_has_syncdrelease11() const {
-  bool value = (_has_bits_[1] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[1] & 0x00000008u) != 0;
   return value;
 }
 inline bool WebFeatures::has_syncdrelease11() const {
   return _internal_has_syncdrelease11();
 }
 inline void WebFeatures::clear_syncdrelease11() {
-  syncdrelease11_ = 0;
-  _has_bits_[1] &= ~0x00000008u;
+  _impl_.syncdrelease11_ = 0;
+  _impl_._has_bits_[1] &= ~0x00000008u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_syncdrelease11() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(syncdrelease11_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.syncdrelease11_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::syncdrelease11() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.syncdRelease11)
@@ -48568,8 +50709,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::syncdrelease11() const
 }
 inline void WebFeatures::_internal_set_syncdrelease11(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[1] |= 0x00000008u;
-  syncdrelease11_ = value;
+  _impl_._has_bits_[1] |= 0x00000008u;
+  _impl_.syncdrelease11_ = value;
 }
 inline void WebFeatures::set_syncdrelease11(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_syncdrelease11(value);
@@ -48578,18 +50719,18 @@ inline void WebFeatures::set_syncdrelease11(::proto::WebFeatures_WebFeaturesFlag
 
 // optional .proto.WebFeatures.WebFeaturesFlag support = 39;
 inline bool WebFeatures::_internal_has_support() const {
-  bool value = (_has_bits_[1] & 0x00000010u) != 0;
+  bool value = (_impl_._has_bits_[1] & 0x00000010u) != 0;
   return value;
 }
 inline bool WebFeatures::has_support() const {
   return _internal_has_support();
 }
 inline void WebFeatures::clear_support() {
-  support_ = 0;
-  _has_bits_[1] &= ~0x00000010u;
+  _impl_.support_ = 0;
+  _impl_._has_bits_[1] &= ~0x00000010u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_support() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(support_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.support_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::support() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.support)
@@ -48597,8 +50738,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::support() const {
 }
 inline void WebFeatures::_internal_set_support(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[1] |= 0x00000010u;
-  support_ = value;
+  _impl_._has_bits_[1] |= 0x00000010u;
+  _impl_.support_ = value;
 }
 inline void WebFeatures::set_support(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_support(value);
@@ -48607,18 +50748,18 @@ inline void WebFeatures::set_support(::proto::WebFeatures_WebFeaturesFlag value)
 
 // optional .proto.WebFeatures.WebFeaturesFlag groupUiiCleanup = 40;
 inline bool WebFeatures::_internal_has_groupuiicleanup() const {
-  bool value = (_has_bits_[1] & 0x00000020u) != 0;
+  bool value = (_impl_._has_bits_[1] & 0x00000020u) != 0;
   return value;
 }
 inline bool WebFeatures::has_groupuiicleanup() const {
   return _internal_has_groupuiicleanup();
 }
 inline void WebFeatures::clear_groupuiicleanup() {
-  groupuiicleanup_ = 0;
-  _has_bits_[1] &= ~0x00000020u;
+  _impl_.groupuiicleanup_ = 0;
+  _impl_._has_bits_[1] &= ~0x00000020u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_groupuiicleanup() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(groupuiicleanup_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.groupuiicleanup_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::groupuiicleanup() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.groupUiiCleanup)
@@ -48626,8 +50767,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::groupuiicleanup() const
 }
 inline void WebFeatures::_internal_set_groupuiicleanup(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[1] |= 0x00000020u;
-  groupuiicleanup_ = value;
+  _impl_._has_bits_[1] |= 0x00000020u;
+  _impl_.groupuiicleanup_ = value;
 }
 inline void WebFeatures::set_groupuiicleanup(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_groupuiicleanup(value);
@@ -48636,18 +50777,18 @@ inline void WebFeatures::set_groupuiicleanup(::proto::WebFeatures_WebFeaturesFla
 
 // optional .proto.WebFeatures.WebFeaturesFlag groupDogfoodingInternalOnly = 41;
 inline bool WebFeatures::_internal_has_groupdogfoodinginternalonly() const {
-  bool value = (_has_bits_[1] & 0x00000040u) != 0;
+  bool value = (_impl_._has_bits_[1] & 0x00000040u) != 0;
   return value;
 }
 inline bool WebFeatures::has_groupdogfoodinginternalonly() const {
   return _internal_has_groupdogfoodinginternalonly();
 }
 inline void WebFeatures::clear_groupdogfoodinginternalonly() {
-  groupdogfoodinginternalonly_ = 0;
-  _has_bits_[1] &= ~0x00000040u;
+  _impl_.groupdogfoodinginternalonly_ = 0;
+  _impl_._has_bits_[1] &= ~0x00000040u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_groupdogfoodinginternalonly() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(groupdogfoodinginternalonly_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.groupdogfoodinginternalonly_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::groupdogfoodinginternalonly() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.groupDogfoodingInternalOnly)
@@ -48655,8 +50796,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::groupdogfoodinginternal
 }
 inline void WebFeatures::_internal_set_groupdogfoodinginternalonly(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[1] |= 0x00000040u;
-  groupdogfoodinginternalonly_ = value;
+  _impl_._has_bits_[1] |= 0x00000040u;
+  _impl_.groupdogfoodinginternalonly_ = value;
 }
 inline void WebFeatures::set_groupdogfoodinginternalonly(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_groupdogfoodinginternalonly(value);
@@ -48665,18 +50806,18 @@ inline void WebFeatures::set_groupdogfoodinginternalonly(::proto::WebFeatures_We
 
 // optional .proto.WebFeatures.WebFeaturesFlag settingsSync = 42;
 inline bool WebFeatures::_internal_has_settingssync() const {
-  bool value = (_has_bits_[1] & 0x00000080u) != 0;
+  bool value = (_impl_._has_bits_[1] & 0x00000080u) != 0;
   return value;
 }
 inline bool WebFeatures::has_settingssync() const {
   return _internal_has_settingssync();
 }
 inline void WebFeatures::clear_settingssync() {
-  settingssync_ = 0;
-  _has_bits_[1] &= ~0x00000080u;
+  _impl_.settingssync_ = 0;
+  _impl_._has_bits_[1] &= ~0x00000080u;
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::_internal_settingssync() const {
-  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(settingssync_);
+  return static_cast< ::proto::WebFeatures_WebFeaturesFlag >(_impl_.settingssync_);
 }
 inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::settingssync() const {
   // @@protoc_insertion_point(field_get:proto.WebFeatures.settingsSync)
@@ -48684,8 +50825,8 @@ inline ::proto::WebFeatures_WebFeaturesFlag WebFeatures::settingssync() const {
 }
 inline void WebFeatures::_internal_set_settingssync(::proto::WebFeatures_WebFeaturesFlag value) {
   assert(::proto::WebFeatures_WebFeaturesFlag_IsValid(value));
-  _has_bits_[1] |= 0x00000080u;
-  settingssync_ = value;
+  _impl_._has_bits_[1] |= 0x00000080u;
+  _impl_.settingssync_ = value;
 }
 inline void WebFeatures::set_settingssync(::proto::WebFeatures_WebFeaturesFlag value) {
   _internal_set_settingssync(value);
@@ -48698,19 +50839,19 @@ inline void WebFeatures::set_settingssync(::proto::WebFeatures_WebFeaturesFlag v
 
 // optional .proto.MessageKey key = 1;
 inline bool NotificationMessageInfo::_internal_has_key() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
-  PROTOBUF_ASSUME(!value || key_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.key_ != nullptr);
   return value;
 }
 inline bool NotificationMessageInfo::has_key() const {
   return _internal_has_key();
 }
 inline void NotificationMessageInfo::clear_key() {
-  if (key_ != nullptr) key_->Clear();
-  _has_bits_[0] &= ~0x00000002u;
+  if (_impl_.key_ != nullptr) _impl_.key_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const ::proto::MessageKey& NotificationMessageInfo::_internal_key() const {
-  const ::proto::MessageKey* p = key_;
+  const ::proto::MessageKey* p = _impl_.key_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::MessageKey&>(
       ::proto::_MessageKey_default_instance_);
 }
@@ -48721,20 +50862,20 @@ inline const ::proto::MessageKey& NotificationMessageInfo::key() const {
 inline void NotificationMessageInfo::unsafe_arena_set_allocated_key(
     ::proto::MessageKey* key) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(key_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.key_);
   }
-  key_ = key;
+  _impl_.key_ = key;
   if (key) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.NotificationMessageInfo.key)
 }
 inline ::proto::MessageKey* NotificationMessageInfo::release_key() {
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::MessageKey* temp = key_;
-  key_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::MessageKey* temp = _impl_.key_;
+  _impl_.key_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -48748,18 +50889,18 @@ inline ::proto::MessageKey* NotificationMessageInfo::release_key() {
 }
 inline ::proto::MessageKey* NotificationMessageInfo::unsafe_arena_release_key() {
   // @@protoc_insertion_point(field_release:proto.NotificationMessageInfo.key)
-  _has_bits_[0] &= ~0x00000002u;
-  ::proto::MessageKey* temp = key_;
-  key_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  ::proto::MessageKey* temp = _impl_.key_;
+  _impl_.key_ = nullptr;
   return temp;
 }
 inline ::proto::MessageKey* NotificationMessageInfo::_internal_mutable_key() {
-  _has_bits_[0] |= 0x00000002u;
-  if (key_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000002u;
+  if (_impl_.key_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::MessageKey>(GetArenaForAllocation());
-    key_ = p;
+    _impl_.key_ = p;
   }
-  return key_;
+  return _impl_.key_;
 }
 inline ::proto::MessageKey* NotificationMessageInfo::mutable_key() {
   ::proto::MessageKey* _msg = _internal_mutable_key();
@@ -48769,38 +50910,38 @@ inline ::proto::MessageKey* NotificationMessageInfo::mutable_key() {
 inline void NotificationMessageInfo::set_allocated_key(::proto::MessageKey* key) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete key_;
+    delete _impl_.key_;
   }
   if (key) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::MessageKey>::GetOwningArena(key);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(key);
     if (message_arena != submessage_arena) {
       key = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, key, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  key_ = key;
+  _impl_.key_ = key;
   // @@protoc_insertion_point(field_set_allocated:proto.NotificationMessageInfo.key)
 }
 
 // optional .proto.Message message = 2;
 inline bool NotificationMessageInfo::_internal_has_message() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || message_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.message_ != nullptr);
   return value;
 }
 inline bool NotificationMessageInfo::has_message() const {
   return _internal_has_message();
 }
 inline void NotificationMessageInfo::clear_message() {
-  if (message_ != nullptr) message_->Clear();
-  _has_bits_[0] &= ~0x00000004u;
+  if (_impl_.message_ != nullptr) _impl_.message_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const ::proto::Message& NotificationMessageInfo::_internal_message() const {
-  const ::proto::Message* p = message_;
+  const ::proto::Message* p = _impl_.message_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::Message&>(
       ::proto::_Message_default_instance_);
 }
@@ -48811,20 +50952,20 @@ inline const ::proto::Message& NotificationMessageInfo::message() const {
 inline void NotificationMessageInfo::unsafe_arena_set_allocated_message(
     ::proto::Message* message) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(message_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.message_);
   }
-  message_ = message;
+  _impl_.message_ = message;
   if (message) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.NotificationMessageInfo.message)
 }
 inline ::proto::Message* NotificationMessageInfo::release_message() {
-  _has_bits_[0] &= ~0x00000004u;
-  ::proto::Message* temp = message_;
-  message_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::proto::Message* temp = _impl_.message_;
+  _impl_.message_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -48838,18 +50979,18 @@ inline ::proto::Message* NotificationMessageInfo::release_message() {
 }
 inline ::proto::Message* NotificationMessageInfo::unsafe_arena_release_message() {
   // @@protoc_insertion_point(field_release:proto.NotificationMessageInfo.message)
-  _has_bits_[0] &= ~0x00000004u;
-  ::proto::Message* temp = message_;
-  message_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::proto::Message* temp = _impl_.message_;
+  _impl_.message_ = nullptr;
   return temp;
 }
 inline ::proto::Message* NotificationMessageInfo::_internal_mutable_message() {
-  _has_bits_[0] |= 0x00000004u;
-  if (message_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000004u;
+  if (_impl_.message_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::Message>(GetArenaForAllocation());
-    message_ = p;
+    _impl_.message_ = p;
   }
-  return message_;
+  return _impl_.message_;
 }
 inline ::proto::Message* NotificationMessageInfo::mutable_message() {
   ::proto::Message* _msg = _internal_mutable_message();
@@ -48859,62 +51000,62 @@ inline ::proto::Message* NotificationMessageInfo::mutable_message() {
 inline void NotificationMessageInfo::set_allocated_message(::proto::Message* message) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete message_;
+    delete _impl_.message_;
   }
   if (message) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::Message>::GetOwningArena(message);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(message);
     if (message_arena != submessage_arena) {
       message = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, message, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
-  message_ = message;
+  _impl_.message_ = message;
   // @@protoc_insertion_point(field_set_allocated:proto.NotificationMessageInfo.message)
 }
 
 // optional uint64 messageTimestamp = 3;
 inline bool NotificationMessageInfo::_internal_has_messagetimestamp() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool NotificationMessageInfo::has_messagetimestamp() const {
   return _internal_has_messagetimestamp();
 }
 inline void NotificationMessageInfo::clear_messagetimestamp() {
-  messagetimestamp_ = uint64_t{0u};
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.messagetimestamp_ = uint64_t{0u};
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 NotificationMessageInfo::_internal_messagetimestamp() const {
-  return messagetimestamp_;
+inline uint64_t NotificationMessageInfo::_internal_messagetimestamp() const {
+  return _impl_.messagetimestamp_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 NotificationMessageInfo::messagetimestamp() const {
+inline uint64_t NotificationMessageInfo::messagetimestamp() const {
   // @@protoc_insertion_point(field_get:proto.NotificationMessageInfo.messageTimestamp)
   return _internal_messagetimestamp();
 }
-inline void NotificationMessageInfo::_internal_set_messagetimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value) {
-  _has_bits_[0] |= 0x00000008u;
-  messagetimestamp_ = value;
+inline void NotificationMessageInfo::_internal_set_messagetimestamp(uint64_t value) {
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.messagetimestamp_ = value;
 }
-inline void NotificationMessageInfo::set_messagetimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value) {
+inline void NotificationMessageInfo::set_messagetimestamp(uint64_t value) {
   _internal_set_messagetimestamp(value);
   // @@protoc_insertion_point(field_set:proto.NotificationMessageInfo.messageTimestamp)
 }
 
 // optional string participant = 4;
 inline bool NotificationMessageInfo::_internal_has_participant() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool NotificationMessageInfo::has_participant() const {
   return _internal_has_participant();
 }
 inline void NotificationMessageInfo::clear_participant() {
-  participant_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.participant_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& NotificationMessageInfo::participant() const {
   // @@protoc_insertion_point(field_get:proto.NotificationMessageInfo.participant)
@@ -48923,8 +51064,8 @@ inline const std::string& NotificationMessageInfo::participant() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void NotificationMessageInfo::set_participant(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- participant_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.participant_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.NotificationMessageInfo.participant)
 }
 inline std::string* NotificationMessageInfo::mutable_participant() {
@@ -48933,32 +51074,42 @@ inline std::string* NotificationMessageInfo::mutable_participant() {
   return _s;
 }
 inline const std::string& NotificationMessageInfo::_internal_participant() const {
-  return participant_.Get();
+  return _impl_.participant_.Get();
 }
 inline void NotificationMessageInfo::_internal_set_participant(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  participant_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.participant_.Set(value, GetArenaForAllocation());
 }
 inline std::string* NotificationMessageInfo::_internal_mutable_participant() {
-  _has_bits_[0] |= 0x00000001u;
-  return participant_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.participant_.Mutable(GetArenaForAllocation());
 }
 inline std::string* NotificationMessageInfo::release_participant() {
   // @@protoc_insertion_point(field_release:proto.NotificationMessageInfo.participant)
   if (!_internal_has_participant()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return participant_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.participant_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.participant_.IsDefault()) {
+    _impl_.participant_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void NotificationMessageInfo::set_allocated_participant(std::string* participant) {
   if (participant != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
+  }
+  _impl_.participant_.SetAllocated(participant, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.participant_.IsDefault()) {
+    _impl_.participant_.Set("", GetArenaForAllocation());
   }
-  participant_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), participant,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.NotificationMessageInfo.participant)
 }
 
@@ -48968,116 +51119,116 @@ inline void NotificationMessageInfo::set_allocated_participant(std::string* part
 
 // optional uint64 timestamp = 2;
 inline bool WebNotificationsInfo::_internal_has_timestamp() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool WebNotificationsInfo::has_timestamp() const {
   return _internal_has_timestamp();
 }
 inline void WebNotificationsInfo::clear_timestamp() {
-  timestamp_ = uint64_t{0u};
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.timestamp_ = uint64_t{0u};
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 WebNotificationsInfo::_internal_timestamp() const {
-  return timestamp_;
+inline uint64_t WebNotificationsInfo::_internal_timestamp() const {
+  return _impl_.timestamp_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 WebNotificationsInfo::timestamp() const {
+inline uint64_t WebNotificationsInfo::timestamp() const {
   // @@protoc_insertion_point(field_get:proto.WebNotificationsInfo.timestamp)
   return _internal_timestamp();
 }
-inline void WebNotificationsInfo::_internal_set_timestamp(::PROTOBUF_NAMESPACE_ID::uint64 value) {
-  _has_bits_[0] |= 0x00000001u;
-  timestamp_ = value;
+inline void WebNotificationsInfo::_internal_set_timestamp(uint64_t value) {
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.timestamp_ = value;
 }
-inline void WebNotificationsInfo::set_timestamp(::PROTOBUF_NAMESPACE_ID::uint64 value) {
+inline void WebNotificationsInfo::set_timestamp(uint64_t value) {
   _internal_set_timestamp(value);
   // @@protoc_insertion_point(field_set:proto.WebNotificationsInfo.timestamp)
 }
 
 // optional uint32 unreadChats = 3;
 inline bool WebNotificationsInfo::_internal_has_unreadchats() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool WebNotificationsInfo::has_unreadchats() const {
   return _internal_has_unreadchats();
 }
 inline void WebNotificationsInfo::clear_unreadchats() {
-  unreadchats_ = 0u;
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.unreadchats_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 WebNotificationsInfo::_internal_unreadchats() const {
-  return unreadchats_;
+inline uint32_t WebNotificationsInfo::_internal_unreadchats() const {
+  return _impl_.unreadchats_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 WebNotificationsInfo::unreadchats() const {
+inline uint32_t WebNotificationsInfo::unreadchats() const {
   // @@protoc_insertion_point(field_get:proto.WebNotificationsInfo.unreadChats)
   return _internal_unreadchats();
 }
-inline void WebNotificationsInfo::_internal_set_unreadchats(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000002u;
-  unreadchats_ = value;
+inline void WebNotificationsInfo::_internal_set_unreadchats(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.unreadchats_ = value;
 }
-inline void WebNotificationsInfo::set_unreadchats(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void WebNotificationsInfo::set_unreadchats(uint32_t value) {
   _internal_set_unreadchats(value);
   // @@protoc_insertion_point(field_set:proto.WebNotificationsInfo.unreadChats)
 }
 
 // optional uint32 notifyMessageCount = 4;
 inline bool WebNotificationsInfo::_internal_has_notifymessagecount() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool WebNotificationsInfo::has_notifymessagecount() const {
   return _internal_has_notifymessagecount();
 }
 inline void WebNotificationsInfo::clear_notifymessagecount() {
-  notifymessagecount_ = 0u;
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.notifymessagecount_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 WebNotificationsInfo::_internal_notifymessagecount() const {
-  return notifymessagecount_;
+inline uint32_t WebNotificationsInfo::_internal_notifymessagecount() const {
+  return _impl_.notifymessagecount_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 WebNotificationsInfo::notifymessagecount() const {
+inline uint32_t WebNotificationsInfo::notifymessagecount() const {
   // @@protoc_insertion_point(field_get:proto.WebNotificationsInfo.notifyMessageCount)
   return _internal_notifymessagecount();
 }
-inline void WebNotificationsInfo::_internal_set_notifymessagecount(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00000004u;
-  notifymessagecount_ = value;
+inline void WebNotificationsInfo::_internal_set_notifymessagecount(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.notifymessagecount_ = value;
 }
-inline void WebNotificationsInfo::set_notifymessagecount(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void WebNotificationsInfo::set_notifymessagecount(uint32_t value) {
   _internal_set_notifymessagecount(value);
   // @@protoc_insertion_point(field_set:proto.WebNotificationsInfo.notifyMessageCount)
 }
 
 // repeated .proto.WebMessageInfo notifyMessages = 5;
 inline int WebNotificationsInfo::_internal_notifymessages_size() const {
-  return notifymessages_.size();
+  return _impl_.notifymessages_.size();
 }
 inline int WebNotificationsInfo::notifymessages_size() const {
   return _internal_notifymessages_size();
 }
 inline void WebNotificationsInfo::clear_notifymessages() {
-  notifymessages_.Clear();
+  _impl_.notifymessages_.Clear();
 }
 inline ::proto::WebMessageInfo* WebNotificationsInfo::mutable_notifymessages(int index) {
   // @@protoc_insertion_point(field_mutable:proto.WebNotificationsInfo.notifyMessages)
-  return notifymessages_.Mutable(index);
+  return _impl_.notifymessages_.Mutable(index);
 }
 inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::WebMessageInfo >*
 WebNotificationsInfo::mutable_notifymessages() {
   // @@protoc_insertion_point(field_mutable_list:proto.WebNotificationsInfo.notifyMessages)
-  return &notifymessages_;
+  return &_impl_.notifymessages_;
 }
 inline const ::proto::WebMessageInfo& WebNotificationsInfo::_internal_notifymessages(int index) const {
-  return notifymessages_.Get(index);
+  return _impl_.notifymessages_.Get(index);
 }
 inline const ::proto::WebMessageInfo& WebNotificationsInfo::notifymessages(int index) const {
   // @@protoc_insertion_point(field_get:proto.WebNotificationsInfo.notifyMessages)
   return _internal_notifymessages(index);
 }
 inline ::proto::WebMessageInfo* WebNotificationsInfo::_internal_add_notifymessages() {
-  return notifymessages_.Add();
+  return _impl_.notifymessages_.Add();
 }
 inline ::proto::WebMessageInfo* WebNotificationsInfo::add_notifymessages() {
   ::proto::WebMessageInfo* _add = _internal_add_notifymessages();
@@ -49087,7 +51238,7 @@ inline ::proto::WebMessageInfo* WebNotificationsInfo::add_notifymessages() {
 inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::proto::WebMessageInfo >&
 WebNotificationsInfo::notifymessages() const {
   // @@protoc_insertion_point(field_list:proto.WebNotificationsInfo.notifyMessages)
-  return notifymessages_;
+  return _impl_.notifymessages_;
 }
 
 // -------------------------------------------------------------------
@@ -49096,18 +51247,18 @@ WebNotificationsInfo::notifymessages() const {
 
 // optional .proto.PaymentInfo.PaymentInfoCurrency currencyDeprecated = 1;
 inline bool PaymentInfo::_internal_has_currencydeprecated() const {
-  bool value = (_has_bits_[0] & 0x00000040u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
   return value;
 }
 inline bool PaymentInfo::has_currencydeprecated() const {
   return _internal_has_currencydeprecated();
 }
 inline void PaymentInfo::clear_currencydeprecated() {
-  currencydeprecated_ = 0;
-  _has_bits_[0] &= ~0x00000040u;
+  _impl_.currencydeprecated_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000040u;
 }
 inline ::proto::PaymentInfo_PaymentInfoCurrency PaymentInfo::_internal_currencydeprecated() const {
-  return static_cast< ::proto::PaymentInfo_PaymentInfoCurrency >(currencydeprecated_);
+  return static_cast< ::proto::PaymentInfo_PaymentInfoCurrency >(_impl_.currencydeprecated_);
 }
 inline ::proto::PaymentInfo_PaymentInfoCurrency PaymentInfo::currencydeprecated() const {
   // @@protoc_insertion_point(field_get:proto.PaymentInfo.currencyDeprecated)
@@ -49115,8 +51266,8 @@ inline ::proto::PaymentInfo_PaymentInfoCurrency PaymentInfo::currencydeprecated(
 }
 inline void PaymentInfo::_internal_set_currencydeprecated(::proto::PaymentInfo_PaymentInfoCurrency value) {
   assert(::proto::PaymentInfo_PaymentInfoCurrency_IsValid(value));
-  _has_bits_[0] |= 0x00000040u;
-  currencydeprecated_ = value;
+  _impl_._has_bits_[0] |= 0x00000040u;
+  _impl_.currencydeprecated_ = value;
 }
 inline void PaymentInfo::set_currencydeprecated(::proto::PaymentInfo_PaymentInfoCurrency value) {
   _internal_set_currencydeprecated(value);
@@ -49125,43 +51276,43 @@ inline void PaymentInfo::set_currencydeprecated(::proto::PaymentInfo_PaymentInfo
 
 // optional uint64 amount1000 = 2;
 inline bool PaymentInfo::_internal_has_amount1000() const {
-  bool value = (_has_bits_[0] & 0x00000020u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
   return value;
 }
 inline bool PaymentInfo::has_amount1000() const {
   return _internal_has_amount1000();
 }
 inline void PaymentInfo::clear_amount1000() {
-  amount1000_ = uint64_t{0u};
-  _has_bits_[0] &= ~0x00000020u;
+  _impl_.amount1000_ = uint64_t{0u};
+  _impl_._has_bits_[0] &= ~0x00000020u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 PaymentInfo::_internal_amount1000() const {
-  return amount1000_;
+inline uint64_t PaymentInfo::_internal_amount1000() const {
+  return _impl_.amount1000_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 PaymentInfo::amount1000() const {
+inline uint64_t PaymentInfo::amount1000() const {
   // @@protoc_insertion_point(field_get:proto.PaymentInfo.amount1000)
   return _internal_amount1000();
 }
-inline void PaymentInfo::_internal_set_amount1000(::PROTOBUF_NAMESPACE_ID::uint64 value) {
-  _has_bits_[0] |= 0x00000020u;
-  amount1000_ = value;
+inline void PaymentInfo::_internal_set_amount1000(uint64_t value) {
+  _impl_._has_bits_[0] |= 0x00000020u;
+  _impl_.amount1000_ = value;
 }
-inline void PaymentInfo::set_amount1000(::PROTOBUF_NAMESPACE_ID::uint64 value) {
+inline void PaymentInfo::set_amount1000(uint64_t value) {
   _internal_set_amount1000(value);
   // @@protoc_insertion_point(field_set:proto.PaymentInfo.amount1000)
 }
 
 // optional string receiverJid = 3;
 inline bool PaymentInfo::_internal_has_receiverjid() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool PaymentInfo::has_receiverjid() const {
   return _internal_has_receiverjid();
 }
 inline void PaymentInfo::clear_receiverjid() {
-  receiverjid_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.receiverjid_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& PaymentInfo::receiverjid() const {
   // @@protoc_insertion_point(field_get:proto.PaymentInfo.receiverJid)
@@ -49170,8 +51321,8 @@ inline const std::string& PaymentInfo::receiverjid() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void PaymentInfo::set_receiverjid(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- receiverjid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.receiverjid_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.PaymentInfo.receiverJid)
 }
 inline std::string* PaymentInfo::mutable_receiverjid() {
@@ -49180,49 +51331,59 @@ inline std::string* PaymentInfo::mutable_receiverjid() {
   return _s;
 }
 inline const std::string& PaymentInfo::_internal_receiverjid() const {
-  return receiverjid_.Get();
+  return _impl_.receiverjid_.Get();
 }
 inline void PaymentInfo::_internal_set_receiverjid(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  receiverjid_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.receiverjid_.Set(value, GetArenaForAllocation());
 }
 inline std::string* PaymentInfo::_internal_mutable_receiverjid() {
-  _has_bits_[0] |= 0x00000001u;
-  return receiverjid_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.receiverjid_.Mutable(GetArenaForAllocation());
 }
 inline std::string* PaymentInfo::release_receiverjid() {
   // @@protoc_insertion_point(field_release:proto.PaymentInfo.receiverJid)
   if (!_internal_has_receiverjid()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return receiverjid_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.receiverjid_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.receiverjid_.IsDefault()) {
+    _impl_.receiverjid_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void PaymentInfo::set_allocated_receiverjid(std::string* receiverjid) {
   if (receiverjid != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
+  }
+  _impl_.receiverjid_.SetAllocated(receiverjid, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.receiverjid_.IsDefault()) {
+    _impl_.receiverjid_.Set("", GetArenaForAllocation());
   }
-  receiverjid_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), receiverjid,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.PaymentInfo.receiverJid)
 }
 
 // optional .proto.PaymentInfo.PaymentInfoStatus status = 4;
 inline bool PaymentInfo::_internal_has_status() const {
-  bool value = (_has_bits_[0] & 0x00000080u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000080u) != 0;
   return value;
 }
 inline bool PaymentInfo::has_status() const {
   return _internal_has_status();
 }
 inline void PaymentInfo::clear_status() {
-  status_ = 0;
-  _has_bits_[0] &= ~0x00000080u;
+  _impl_.status_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000080u;
 }
 inline ::proto::PaymentInfo_PaymentInfoStatus PaymentInfo::_internal_status() const {
-  return static_cast< ::proto::PaymentInfo_PaymentInfoStatus >(status_);
+  return static_cast< ::proto::PaymentInfo_PaymentInfoStatus >(_impl_.status_);
 }
 inline ::proto::PaymentInfo_PaymentInfoStatus PaymentInfo::status() const {
   // @@protoc_insertion_point(field_get:proto.PaymentInfo.status)
@@ -49230,8 +51391,8 @@ inline ::proto::PaymentInfo_PaymentInfoStatus PaymentInfo::status() const {
 }
 inline void PaymentInfo::_internal_set_status(::proto::PaymentInfo_PaymentInfoStatus value) {
   assert(::proto::PaymentInfo_PaymentInfoStatus_IsValid(value));
-  _has_bits_[0] |= 0x00000080u;
-  status_ = value;
+  _impl_._has_bits_[0] |= 0x00000080u;
+  _impl_.status_ = value;
 }
 inline void PaymentInfo::set_status(::proto::PaymentInfo_PaymentInfoStatus value) {
   _internal_set_status(value);
@@ -49240,47 +51401,47 @@ inline void PaymentInfo::set_status(::proto::PaymentInfo_PaymentInfoStatus value
 
 // optional uint64 transactionTimestamp = 5;
 inline bool PaymentInfo::_internal_has_transactiontimestamp() const {
-  bool value = (_has_bits_[0] & 0x00000100u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000100u) != 0;
   return value;
 }
 inline bool PaymentInfo::has_transactiontimestamp() const {
   return _internal_has_transactiontimestamp();
 }
 inline void PaymentInfo::clear_transactiontimestamp() {
-  transactiontimestamp_ = uint64_t{0u};
-  _has_bits_[0] &= ~0x00000100u;
+  _impl_.transactiontimestamp_ = uint64_t{0u};
+  _impl_._has_bits_[0] &= ~0x00000100u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 PaymentInfo::_internal_transactiontimestamp() const {
-  return transactiontimestamp_;
+inline uint64_t PaymentInfo::_internal_transactiontimestamp() const {
+  return _impl_.transactiontimestamp_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 PaymentInfo::transactiontimestamp() const {
+inline uint64_t PaymentInfo::transactiontimestamp() const {
   // @@protoc_insertion_point(field_get:proto.PaymentInfo.transactionTimestamp)
   return _internal_transactiontimestamp();
 }
-inline void PaymentInfo::_internal_set_transactiontimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value) {
-  _has_bits_[0] |= 0x00000100u;
-  transactiontimestamp_ = value;
+inline void PaymentInfo::_internal_set_transactiontimestamp(uint64_t value) {
+  _impl_._has_bits_[0] |= 0x00000100u;
+  _impl_.transactiontimestamp_ = value;
 }
-inline void PaymentInfo::set_transactiontimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value) {
+inline void PaymentInfo::set_transactiontimestamp(uint64_t value) {
   _internal_set_transactiontimestamp(value);
   // @@protoc_insertion_point(field_set:proto.PaymentInfo.transactionTimestamp)
 }
 
 // optional .proto.MessageKey requestMessageKey = 6;
 inline bool PaymentInfo::_internal_has_requestmessagekey() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
-  PROTOBUF_ASSUME(!value || requestmessagekey_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.requestmessagekey_ != nullptr);
   return value;
 }
 inline bool PaymentInfo::has_requestmessagekey() const {
   return _internal_has_requestmessagekey();
 }
 inline void PaymentInfo::clear_requestmessagekey() {
-  if (requestmessagekey_ != nullptr) requestmessagekey_->Clear();
-  _has_bits_[0] &= ~0x00000004u;
+  if (_impl_.requestmessagekey_ != nullptr) _impl_.requestmessagekey_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const ::proto::MessageKey& PaymentInfo::_internal_requestmessagekey() const {
-  const ::proto::MessageKey* p = requestmessagekey_;
+  const ::proto::MessageKey* p = _impl_.requestmessagekey_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::MessageKey&>(
       ::proto::_MessageKey_default_instance_);
 }
@@ -49291,20 +51452,20 @@ inline const ::proto::MessageKey& PaymentInfo::requestmessagekey() const {
 inline void PaymentInfo::unsafe_arena_set_allocated_requestmessagekey(
     ::proto::MessageKey* requestmessagekey) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(requestmessagekey_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.requestmessagekey_);
   }
-  requestmessagekey_ = requestmessagekey;
+  _impl_.requestmessagekey_ = requestmessagekey;
   if (requestmessagekey) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.PaymentInfo.requestMessageKey)
 }
 inline ::proto::MessageKey* PaymentInfo::release_requestmessagekey() {
-  _has_bits_[0] &= ~0x00000004u;
-  ::proto::MessageKey* temp = requestmessagekey_;
-  requestmessagekey_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::proto::MessageKey* temp = _impl_.requestmessagekey_;
+  _impl_.requestmessagekey_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -49318,18 +51479,18 @@ inline ::proto::MessageKey* PaymentInfo::release_requestmessagekey() {
 }
 inline ::proto::MessageKey* PaymentInfo::unsafe_arena_release_requestmessagekey() {
   // @@protoc_insertion_point(field_release:proto.PaymentInfo.requestMessageKey)
-  _has_bits_[0] &= ~0x00000004u;
-  ::proto::MessageKey* temp = requestmessagekey_;
-  requestmessagekey_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  ::proto::MessageKey* temp = _impl_.requestmessagekey_;
+  _impl_.requestmessagekey_ = nullptr;
   return temp;
 }
 inline ::proto::MessageKey* PaymentInfo::_internal_mutable_requestmessagekey() {
-  _has_bits_[0] |= 0x00000004u;
-  if (requestmessagekey_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000004u;
+  if (_impl_.requestmessagekey_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::MessageKey>(GetArenaForAllocation());
-    requestmessagekey_ = p;
+    _impl_.requestmessagekey_ = p;
   }
-  return requestmessagekey_;
+  return _impl_.requestmessagekey_;
 }
 inline ::proto::MessageKey* PaymentInfo::mutable_requestmessagekey() {
   ::proto::MessageKey* _msg = _internal_mutable_requestmessagekey();
@@ -49339,73 +51500,73 @@ inline ::proto::MessageKey* PaymentInfo::mutable_requestmessagekey() {
 inline void PaymentInfo::set_allocated_requestmessagekey(::proto::MessageKey* requestmessagekey) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete requestmessagekey_;
+    delete _impl_.requestmessagekey_;
   }
   if (requestmessagekey) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::MessageKey>::GetOwningArena(requestmessagekey);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(requestmessagekey);
     if (message_arena != submessage_arena) {
       requestmessagekey = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, requestmessagekey, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
-  requestmessagekey_ = requestmessagekey;
+  _impl_.requestmessagekey_ = requestmessagekey;
   // @@protoc_insertion_point(field_set_allocated:proto.PaymentInfo.requestMessageKey)
 }
 
 // optional uint64 expiryTimestamp = 7;
 inline bool PaymentInfo::_internal_has_expirytimestamp() const {
-  bool value = (_has_bits_[0] & 0x00000200u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000200u) != 0;
   return value;
 }
 inline bool PaymentInfo::has_expirytimestamp() const {
   return _internal_has_expirytimestamp();
 }
 inline void PaymentInfo::clear_expirytimestamp() {
-  expirytimestamp_ = uint64_t{0u};
-  _has_bits_[0] &= ~0x00000200u;
+  _impl_.expirytimestamp_ = uint64_t{0u};
+  _impl_._has_bits_[0] &= ~0x00000200u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 PaymentInfo::_internal_expirytimestamp() const {
-  return expirytimestamp_;
+inline uint64_t PaymentInfo::_internal_expirytimestamp() const {
+  return _impl_.expirytimestamp_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 PaymentInfo::expirytimestamp() const {
+inline uint64_t PaymentInfo::expirytimestamp() const {
   // @@protoc_insertion_point(field_get:proto.PaymentInfo.expiryTimestamp)
   return _internal_expirytimestamp();
 }
-inline void PaymentInfo::_internal_set_expirytimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value) {
-  _has_bits_[0] |= 0x00000200u;
-  expirytimestamp_ = value;
+inline void PaymentInfo::_internal_set_expirytimestamp(uint64_t value) {
+  _impl_._has_bits_[0] |= 0x00000200u;
+  _impl_.expirytimestamp_ = value;
 }
-inline void PaymentInfo::set_expirytimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value) {
+inline void PaymentInfo::set_expirytimestamp(uint64_t value) {
   _internal_set_expirytimestamp(value);
   // @@protoc_insertion_point(field_set:proto.PaymentInfo.expiryTimestamp)
 }
 
 // optional bool futureproofed = 8;
 inline bool PaymentInfo::_internal_has_futureproofed() const {
-  bool value = (_has_bits_[0] & 0x00000400u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000400u) != 0;
   return value;
 }
 inline bool PaymentInfo::has_futureproofed() const {
   return _internal_has_futureproofed();
 }
 inline void PaymentInfo::clear_futureproofed() {
-  futureproofed_ = false;
-  _has_bits_[0] &= ~0x00000400u;
+  _impl_.futureproofed_ = false;
+  _impl_._has_bits_[0] &= ~0x00000400u;
 }
 inline bool PaymentInfo::_internal_futureproofed() const {
-  return futureproofed_;
+  return _impl_.futureproofed_;
 }
 inline bool PaymentInfo::futureproofed() const {
   // @@protoc_insertion_point(field_get:proto.PaymentInfo.futureproofed)
   return _internal_futureproofed();
 }
 inline void PaymentInfo::_internal_set_futureproofed(bool value) {
-  _has_bits_[0] |= 0x00000400u;
-  futureproofed_ = value;
+  _impl_._has_bits_[0] |= 0x00000400u;
+  _impl_.futureproofed_ = value;
 }
 inline void PaymentInfo::set_futureproofed(bool value) {
   _internal_set_futureproofed(value);
@@ -49414,15 +51575,15 @@ inline void PaymentInfo::set_futureproofed(bool value) {
 
 // optional string currency = 9;
 inline bool PaymentInfo::_internal_has_currency() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool PaymentInfo::has_currency() const {
   return _internal_has_currency();
 }
 inline void PaymentInfo::clear_currency() {
-  currency_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.currency_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& PaymentInfo::currency() const {
   // @@protoc_insertion_point(field_get:proto.PaymentInfo.currency)
@@ -49431,8 +51592,8 @@ inline const std::string& PaymentInfo::currency() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void PaymentInfo::set_currency(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- currency_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.currency_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.PaymentInfo.currency)
 }
 inline std::string* PaymentInfo::mutable_currency() {
@@ -49441,49 +51602,59 @@ inline std::string* PaymentInfo::mutable_currency() {
   return _s;
 }
 inline const std::string& PaymentInfo::_internal_currency() const {
-  return currency_.Get();
+  return _impl_.currency_.Get();
 }
 inline void PaymentInfo::_internal_set_currency(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  currency_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.currency_.Set(value, GetArenaForAllocation());
 }
 inline std::string* PaymentInfo::_internal_mutable_currency() {
-  _has_bits_[0] |= 0x00000002u;
-  return currency_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.currency_.Mutable(GetArenaForAllocation());
 }
 inline std::string* PaymentInfo::release_currency() {
   // @@protoc_insertion_point(field_release:proto.PaymentInfo.currency)
   if (!_internal_has_currency()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return currency_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.currency_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.currency_.IsDefault()) {
+    _impl_.currency_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void PaymentInfo::set_allocated_currency(std::string* currency) {
   if (currency != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
+  }
+  _impl_.currency_.SetAllocated(currency, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.currency_.IsDefault()) {
+    _impl_.currency_.Set("", GetArenaForAllocation());
   }
-  currency_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), currency,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.PaymentInfo.currency)
 }
 
 // optional .proto.PaymentInfo.PaymentInfoTxnStatus txnStatus = 10;
 inline bool PaymentInfo::_internal_has_txnstatus() const {
-  bool value = (_has_bits_[0] & 0x00001000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00001000u) != 0;
   return value;
 }
 inline bool PaymentInfo::has_txnstatus() const {
   return _internal_has_txnstatus();
 }
 inline void PaymentInfo::clear_txnstatus() {
-  txnstatus_ = 0;
-  _has_bits_[0] &= ~0x00001000u;
+  _impl_.txnstatus_ = 0;
+  _impl_._has_bits_[0] &= ~0x00001000u;
 }
 inline ::proto::PaymentInfo_PaymentInfoTxnStatus PaymentInfo::_internal_txnstatus() const {
-  return static_cast< ::proto::PaymentInfo_PaymentInfoTxnStatus >(txnstatus_);
+  return static_cast< ::proto::PaymentInfo_PaymentInfoTxnStatus >(_impl_.txnstatus_);
 }
 inline ::proto::PaymentInfo_PaymentInfoTxnStatus PaymentInfo::txnstatus() const {
   // @@protoc_insertion_point(field_get:proto.PaymentInfo.txnStatus)
@@ -49491,8 +51662,8 @@ inline ::proto::PaymentInfo_PaymentInfoTxnStatus PaymentInfo::txnstatus() const
 }
 inline void PaymentInfo::_internal_set_txnstatus(::proto::PaymentInfo_PaymentInfoTxnStatus value) {
   assert(::proto::PaymentInfo_PaymentInfoTxnStatus_IsValid(value));
-  _has_bits_[0] |= 0x00001000u;
-  txnstatus_ = value;
+  _impl_._has_bits_[0] |= 0x00001000u;
+  _impl_.txnstatus_ = value;
 }
 inline void PaymentInfo::set_txnstatus(::proto::PaymentInfo_PaymentInfoTxnStatus value) {
   _internal_set_txnstatus(value);
@@ -49501,26 +51672,26 @@ inline void PaymentInfo::set_txnstatus(::proto::PaymentInfo_PaymentInfoTxnStatus
 
 // optional bool useNoviFiatFormat = 11;
 inline bool PaymentInfo::_internal_has_usenovifiatformat() const {
-  bool value = (_has_bits_[0] & 0x00000800u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000800u) != 0;
   return value;
 }
 inline bool PaymentInfo::has_usenovifiatformat() const {
   return _internal_has_usenovifiatformat();
 }
 inline void PaymentInfo::clear_usenovifiatformat() {
-  usenovifiatformat_ = false;
-  _has_bits_[0] &= ~0x00000800u;
+  _impl_.usenovifiatformat_ = false;
+  _impl_._has_bits_[0] &= ~0x00000800u;
 }
 inline bool PaymentInfo::_internal_usenovifiatformat() const {
-  return usenovifiatformat_;
+  return _impl_.usenovifiatformat_;
 }
 inline bool PaymentInfo::usenovifiatformat() const {
   // @@protoc_insertion_point(field_get:proto.PaymentInfo.useNoviFiatFormat)
   return _internal_usenovifiatformat();
 }
 inline void PaymentInfo::_internal_set_usenovifiatformat(bool value) {
-  _has_bits_[0] |= 0x00000800u;
-  usenovifiatformat_ = value;
+  _impl_._has_bits_[0] |= 0x00000800u;
+  _impl_.usenovifiatformat_ = value;
 }
 inline void PaymentInfo::set_usenovifiatformat(bool value) {
   _internal_set_usenovifiatformat(value);
@@ -49529,19 +51700,19 @@ inline void PaymentInfo::set_usenovifiatformat(bool value) {
 
 // optional .proto.PaymentMoney primaryAmount = 12;
 inline bool PaymentInfo::_internal_has_primaryamount() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
-  PROTOBUF_ASSUME(!value || primaryamount_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.primaryamount_ != nullptr);
   return value;
 }
 inline bool PaymentInfo::has_primaryamount() const {
   return _internal_has_primaryamount();
 }
 inline void PaymentInfo::clear_primaryamount() {
-  if (primaryamount_ != nullptr) primaryamount_->Clear();
-  _has_bits_[0] &= ~0x00000008u;
+  if (_impl_.primaryamount_ != nullptr) _impl_.primaryamount_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline const ::proto::PaymentMoney& PaymentInfo::_internal_primaryamount() const {
-  const ::proto::PaymentMoney* p = primaryamount_;
+  const ::proto::PaymentMoney* p = _impl_.primaryamount_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::PaymentMoney&>(
       ::proto::_PaymentMoney_default_instance_);
 }
@@ -49552,20 +51723,20 @@ inline const ::proto::PaymentMoney& PaymentInfo::primaryamount() const {
 inline void PaymentInfo::unsafe_arena_set_allocated_primaryamount(
     ::proto::PaymentMoney* primaryamount) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(primaryamount_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.primaryamount_);
   }
-  primaryamount_ = primaryamount;
+  _impl_.primaryamount_ = primaryamount;
   if (primaryamount) {
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.PaymentInfo.primaryAmount)
 }
 inline ::proto::PaymentMoney* PaymentInfo::release_primaryamount() {
-  _has_bits_[0] &= ~0x00000008u;
-  ::proto::PaymentMoney* temp = primaryamount_;
-  primaryamount_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  ::proto::PaymentMoney* temp = _impl_.primaryamount_;
+  _impl_.primaryamount_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -49579,18 +51750,18 @@ inline ::proto::PaymentMoney* PaymentInfo::release_primaryamount() {
 }
 inline ::proto::PaymentMoney* PaymentInfo::unsafe_arena_release_primaryamount() {
   // @@protoc_insertion_point(field_release:proto.PaymentInfo.primaryAmount)
-  _has_bits_[0] &= ~0x00000008u;
-  ::proto::PaymentMoney* temp = primaryamount_;
-  primaryamount_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  ::proto::PaymentMoney* temp = _impl_.primaryamount_;
+  _impl_.primaryamount_ = nullptr;
   return temp;
 }
 inline ::proto::PaymentMoney* PaymentInfo::_internal_mutable_primaryamount() {
-  _has_bits_[0] |= 0x00000008u;
-  if (primaryamount_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000008u;
+  if (_impl_.primaryamount_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::PaymentMoney>(GetArenaForAllocation());
-    primaryamount_ = p;
+    _impl_.primaryamount_ = p;
   }
-  return primaryamount_;
+  return _impl_.primaryamount_;
 }
 inline ::proto::PaymentMoney* PaymentInfo::mutable_primaryamount() {
   ::proto::PaymentMoney* _msg = _internal_mutable_primaryamount();
@@ -49600,38 +51771,38 @@ inline ::proto::PaymentMoney* PaymentInfo::mutable_primaryamount() {
 inline void PaymentInfo::set_allocated_primaryamount(::proto::PaymentMoney* primaryamount) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete primaryamount_;
+    delete _impl_.primaryamount_;
   }
   if (primaryamount) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::PaymentMoney>::GetOwningArena(primaryamount);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(primaryamount);
     if (message_arena != submessage_arena) {
       primaryamount = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, primaryamount, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
   }
-  primaryamount_ = primaryamount;
+  _impl_.primaryamount_ = primaryamount;
   // @@protoc_insertion_point(field_set_allocated:proto.PaymentInfo.primaryAmount)
 }
 
 // optional .proto.PaymentMoney exchangeAmount = 13;
 inline bool PaymentInfo::_internal_has_exchangeamount() const {
-  bool value = (_has_bits_[0] & 0x00000010u) != 0;
-  PROTOBUF_ASSUME(!value || exchangeamount_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.exchangeamount_ != nullptr);
   return value;
 }
 inline bool PaymentInfo::has_exchangeamount() const {
   return _internal_has_exchangeamount();
 }
 inline void PaymentInfo::clear_exchangeamount() {
-  if (exchangeamount_ != nullptr) exchangeamount_->Clear();
-  _has_bits_[0] &= ~0x00000010u;
+  if (_impl_.exchangeamount_ != nullptr) _impl_.exchangeamount_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000010u;
 }
 inline const ::proto::PaymentMoney& PaymentInfo::_internal_exchangeamount() const {
-  const ::proto::PaymentMoney* p = exchangeamount_;
+  const ::proto::PaymentMoney* p = _impl_.exchangeamount_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::PaymentMoney&>(
       ::proto::_PaymentMoney_default_instance_);
 }
@@ -49642,20 +51813,20 @@ inline const ::proto::PaymentMoney& PaymentInfo::exchangeamount() const {
 inline void PaymentInfo::unsafe_arena_set_allocated_exchangeamount(
     ::proto::PaymentMoney* exchangeamount) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(exchangeamount_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.exchangeamount_);
   }
-  exchangeamount_ = exchangeamount;
+  _impl_.exchangeamount_ = exchangeamount;
   if (exchangeamount) {
-    _has_bits_[0] |= 0x00000010u;
+    _impl_._has_bits_[0] |= 0x00000010u;
   } else {
-    _has_bits_[0] &= ~0x00000010u;
+    _impl_._has_bits_[0] &= ~0x00000010u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.PaymentInfo.exchangeAmount)
 }
 inline ::proto::PaymentMoney* PaymentInfo::release_exchangeamount() {
-  _has_bits_[0] &= ~0x00000010u;
-  ::proto::PaymentMoney* temp = exchangeamount_;
-  exchangeamount_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000010u;
+  ::proto::PaymentMoney* temp = _impl_.exchangeamount_;
+  _impl_.exchangeamount_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -49669,18 +51840,18 @@ inline ::proto::PaymentMoney* PaymentInfo::release_exchangeamount() {
 }
 inline ::proto::PaymentMoney* PaymentInfo::unsafe_arena_release_exchangeamount() {
   // @@protoc_insertion_point(field_release:proto.PaymentInfo.exchangeAmount)
-  _has_bits_[0] &= ~0x00000010u;
-  ::proto::PaymentMoney* temp = exchangeamount_;
-  exchangeamount_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000010u;
+  ::proto::PaymentMoney* temp = _impl_.exchangeamount_;
+  _impl_.exchangeamount_ = nullptr;
   return temp;
 }
 inline ::proto::PaymentMoney* PaymentInfo::_internal_mutable_exchangeamount() {
-  _has_bits_[0] |= 0x00000010u;
-  if (exchangeamount_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000010u;
+  if (_impl_.exchangeamount_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::PaymentMoney>(GetArenaForAllocation());
-    exchangeamount_ = p;
+    _impl_.exchangeamount_ = p;
   }
-  return exchangeamount_;
+  return _impl_.exchangeamount_;
 }
 inline ::proto::PaymentMoney* PaymentInfo::mutable_exchangeamount() {
   ::proto::PaymentMoney* _msg = _internal_mutable_exchangeamount();
@@ -49690,20 +51861,20 @@ inline ::proto::PaymentMoney* PaymentInfo::mutable_exchangeamount() {
 inline void PaymentInfo::set_allocated_exchangeamount(::proto::PaymentMoney* exchangeamount) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete exchangeamount_;
+    delete _impl_.exchangeamount_;
   }
   if (exchangeamount) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::PaymentMoney>::GetOwningArena(exchangeamount);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(exchangeamount);
     if (message_arena != submessage_arena) {
       exchangeamount = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, exchangeamount, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000010u;
+    _impl_._has_bits_[0] |= 0x00000010u;
   } else {
-    _has_bits_[0] &= ~0x00000010u;
+    _impl_._has_bits_[0] &= ~0x00000010u;
   }
-  exchangeamount_ = exchangeamount;
+  _impl_.exchangeamount_ = exchangeamount;
   // @@protoc_insertion_point(field_set_allocated:proto.PaymentInfo.exchangeAmount)
 }
 
@@ -49713,19 +51884,19 @@ inline void PaymentInfo::set_allocated_exchangeamount(::proto::PaymentMoney* exc
 
 // required .proto.MessageKey key = 1;
 inline bool WebMessageInfo::_internal_has_key() const {
-  bool value = (_has_bits_[0] & 0x00000010u) != 0;
-  PROTOBUF_ASSUME(!value || key_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000010u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.key_ != nullptr);
   return value;
 }
 inline bool WebMessageInfo::has_key() const {
   return _internal_has_key();
 }
 inline void WebMessageInfo::clear_key() {
-  if (key_ != nullptr) key_->Clear();
-  _has_bits_[0] &= ~0x00000010u;
+  if (_impl_.key_ != nullptr) _impl_.key_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000010u;
 }
 inline const ::proto::MessageKey& WebMessageInfo::_internal_key() const {
-  const ::proto::MessageKey* p = key_;
+  const ::proto::MessageKey* p = _impl_.key_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::MessageKey&>(
       ::proto::_MessageKey_default_instance_);
 }
@@ -49736,20 +51907,20 @@ inline const ::proto::MessageKey& WebMessageInfo::key() const {
 inline void WebMessageInfo::unsafe_arena_set_allocated_key(
     ::proto::MessageKey* key) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(key_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.key_);
   }
-  key_ = key;
+  _impl_.key_ = key;
   if (key) {
-    _has_bits_[0] |= 0x00000010u;
+    _impl_._has_bits_[0] |= 0x00000010u;
   } else {
-    _has_bits_[0] &= ~0x00000010u;
+    _impl_._has_bits_[0] &= ~0x00000010u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.WebMessageInfo.key)
 }
 inline ::proto::MessageKey* WebMessageInfo::release_key() {
-  _has_bits_[0] &= ~0x00000010u;
-  ::proto::MessageKey* temp = key_;
-  key_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000010u;
+  ::proto::MessageKey* temp = _impl_.key_;
+  _impl_.key_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -49763,18 +51934,18 @@ inline ::proto::MessageKey* WebMessageInfo::release_key() {
 }
 inline ::proto::MessageKey* WebMessageInfo::unsafe_arena_release_key() {
   // @@protoc_insertion_point(field_release:proto.WebMessageInfo.key)
-  _has_bits_[0] &= ~0x00000010u;
-  ::proto::MessageKey* temp = key_;
-  key_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000010u;
+  ::proto::MessageKey* temp = _impl_.key_;
+  _impl_.key_ = nullptr;
   return temp;
 }
 inline ::proto::MessageKey* WebMessageInfo::_internal_mutable_key() {
-  _has_bits_[0] |= 0x00000010u;
-  if (key_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000010u;
+  if (_impl_.key_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::MessageKey>(GetArenaForAllocation());
-    key_ = p;
+    _impl_.key_ = p;
   }
-  return key_;
+  return _impl_.key_;
 }
 inline ::proto::MessageKey* WebMessageInfo::mutable_key() {
   ::proto::MessageKey* _msg = _internal_mutable_key();
@@ -49784,38 +51955,38 @@ inline ::proto::MessageKey* WebMessageInfo::mutable_key() {
 inline void WebMessageInfo::set_allocated_key(::proto::MessageKey* key) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete key_;
+    delete _impl_.key_;
   }
   if (key) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::MessageKey>::GetOwningArena(key);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(key);
     if (message_arena != submessage_arena) {
       key = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, key, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000010u;
+    _impl_._has_bits_[0] |= 0x00000010u;
   } else {
-    _has_bits_[0] &= ~0x00000010u;
+    _impl_._has_bits_[0] &= ~0x00000010u;
   }
-  key_ = key;
+  _impl_.key_ = key;
   // @@protoc_insertion_point(field_set_allocated:proto.WebMessageInfo.key)
 }
 
 // optional .proto.Message message = 2;
 inline bool WebMessageInfo::_internal_has_message() const {
-  bool value = (_has_bits_[0] & 0x00000020u) != 0;
-  PROTOBUF_ASSUME(!value || message_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000020u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.message_ != nullptr);
   return value;
 }
 inline bool WebMessageInfo::has_message() const {
   return _internal_has_message();
 }
 inline void WebMessageInfo::clear_message() {
-  if (message_ != nullptr) message_->Clear();
-  _has_bits_[0] &= ~0x00000020u;
+  if (_impl_.message_ != nullptr) _impl_.message_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000020u;
 }
 inline const ::proto::Message& WebMessageInfo::_internal_message() const {
-  const ::proto::Message* p = message_;
+  const ::proto::Message* p = _impl_.message_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::Message&>(
       ::proto::_Message_default_instance_);
 }
@@ -49826,20 +51997,20 @@ inline const ::proto::Message& WebMessageInfo::message() const {
 inline void WebMessageInfo::unsafe_arena_set_allocated_message(
     ::proto::Message* message) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(message_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.message_);
   }
-  message_ = message;
+  _impl_.message_ = message;
   if (message) {
-    _has_bits_[0] |= 0x00000020u;
+    _impl_._has_bits_[0] |= 0x00000020u;
   } else {
-    _has_bits_[0] &= ~0x00000020u;
+    _impl_._has_bits_[0] &= ~0x00000020u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.WebMessageInfo.message)
 }
 inline ::proto::Message* WebMessageInfo::release_message() {
-  _has_bits_[0] &= ~0x00000020u;
-  ::proto::Message* temp = message_;
-  message_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000020u;
+  ::proto::Message* temp = _impl_.message_;
+  _impl_.message_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -49853,18 +52024,18 @@ inline ::proto::Message* WebMessageInfo::release_message() {
 }
 inline ::proto::Message* WebMessageInfo::unsafe_arena_release_message() {
   // @@protoc_insertion_point(field_release:proto.WebMessageInfo.message)
-  _has_bits_[0] &= ~0x00000020u;
-  ::proto::Message* temp = message_;
-  message_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000020u;
+  ::proto::Message* temp = _impl_.message_;
+  _impl_.message_ = nullptr;
   return temp;
 }
 inline ::proto::Message* WebMessageInfo::_internal_mutable_message() {
-  _has_bits_[0] |= 0x00000020u;
-  if (message_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000020u;
+  if (_impl_.message_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::Message>(GetArenaForAllocation());
-    message_ = p;
+    _impl_.message_ = p;
   }
-  return message_;
+  return _impl_.message_;
 }
 inline ::proto::Message* WebMessageInfo::mutable_message() {
   ::proto::Message* _msg = _internal_mutable_message();
@@ -49874,65 +52045,65 @@ inline ::proto::Message* WebMessageInfo::mutable_message() {
 inline void WebMessageInfo::set_allocated_message(::proto::Message* message) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete message_;
+    delete _impl_.message_;
   }
   if (message) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::Message>::GetOwningArena(message);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(message);
     if (message_arena != submessage_arena) {
       message = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, message, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000020u;
+    _impl_._has_bits_[0] |= 0x00000020u;
   } else {
-    _has_bits_[0] &= ~0x00000020u;
+    _impl_._has_bits_[0] &= ~0x00000020u;
   }
-  message_ = message;
+  _impl_.message_ = message;
   // @@protoc_insertion_point(field_set_allocated:proto.WebMessageInfo.message)
 }
 
 // optional uint64 messageTimestamp = 3;
 inline bool WebMessageInfo::_internal_has_messagetimestamp() const {
-  bool value = (_has_bits_[0] & 0x00000200u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000200u) != 0;
   return value;
 }
 inline bool WebMessageInfo::has_messagetimestamp() const {
   return _internal_has_messagetimestamp();
 }
 inline void WebMessageInfo::clear_messagetimestamp() {
-  messagetimestamp_ = uint64_t{0u};
-  _has_bits_[0] &= ~0x00000200u;
+  _impl_.messagetimestamp_ = uint64_t{0u};
+  _impl_._has_bits_[0] &= ~0x00000200u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 WebMessageInfo::_internal_messagetimestamp() const {
-  return messagetimestamp_;
+inline uint64_t WebMessageInfo::_internal_messagetimestamp() const {
+  return _impl_.messagetimestamp_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 WebMessageInfo::messagetimestamp() const {
+inline uint64_t WebMessageInfo::messagetimestamp() const {
   // @@protoc_insertion_point(field_get:proto.WebMessageInfo.messageTimestamp)
   return _internal_messagetimestamp();
 }
-inline void WebMessageInfo::_internal_set_messagetimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value) {
-  _has_bits_[0] |= 0x00000200u;
-  messagetimestamp_ = value;
+inline void WebMessageInfo::_internal_set_messagetimestamp(uint64_t value) {
+  _impl_._has_bits_[0] |= 0x00000200u;
+  _impl_.messagetimestamp_ = value;
 }
-inline void WebMessageInfo::set_messagetimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value) {
+inline void WebMessageInfo::set_messagetimestamp(uint64_t value) {
   _internal_set_messagetimestamp(value);
   // @@protoc_insertion_point(field_set:proto.WebMessageInfo.messageTimestamp)
 }
 
 // optional .proto.WebMessageInfo.WebMessageInfoStatus status = 4;
 inline bool WebMessageInfo::_internal_has_status() const {
-  bool value = (_has_bits_[0] & 0x00000400u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000400u) != 0;
   return value;
 }
 inline bool WebMessageInfo::has_status() const {
   return _internal_has_status();
 }
 inline void WebMessageInfo::clear_status() {
-  status_ = 0;
-  _has_bits_[0] &= ~0x00000400u;
+  _impl_.status_ = 0;
+  _impl_._has_bits_[0] &= ~0x00000400u;
 }
 inline ::proto::WebMessageInfo_WebMessageInfoStatus WebMessageInfo::_internal_status() const {
-  return static_cast< ::proto::WebMessageInfo_WebMessageInfoStatus >(status_);
+  return static_cast< ::proto::WebMessageInfo_WebMessageInfoStatus >(_impl_.status_);
 }
 inline ::proto::WebMessageInfo_WebMessageInfoStatus WebMessageInfo::status() const {
   // @@protoc_insertion_point(field_get:proto.WebMessageInfo.status)
@@ -49940,8 +52111,8 @@ inline ::proto::WebMessageInfo_WebMessageInfoStatus WebMessageInfo::status() con
 }
 inline void WebMessageInfo::_internal_set_status(::proto::WebMessageInfo_WebMessageInfoStatus value) {
   assert(::proto::WebMessageInfo_WebMessageInfoStatus_IsValid(value));
-  _has_bits_[0] |= 0x00000400u;
-  status_ = value;
+  _impl_._has_bits_[0] |= 0x00000400u;
+  _impl_.status_ = value;
 }
 inline void WebMessageInfo::set_status(::proto::WebMessageInfo_WebMessageInfoStatus value) {
   _internal_set_status(value);
@@ -49950,15 +52121,15 @@ inline void WebMessageInfo::set_status(::proto::WebMessageInfo_WebMessageInfoSta
 
 // optional string participant = 5;
 inline bool WebMessageInfo::_internal_has_participant() const {
-  bool value = (_has_bits_[0] & 0x00000001u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000001u) != 0;
   return value;
 }
 inline bool WebMessageInfo::has_participant() const {
   return _internal_has_participant();
 }
 inline void WebMessageInfo::clear_participant() {
-  participant_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000001u;
+  _impl_.participant_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000001u;
 }
 inline const std::string& WebMessageInfo::participant() const {
   // @@protoc_insertion_point(field_get:proto.WebMessageInfo.participant)
@@ -49967,8 +52138,8 @@ inline const std::string& WebMessageInfo::participant() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void WebMessageInfo::set_participant(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000001u;
- participant_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000001u;
+ _impl_.participant_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.WebMessageInfo.participant)
 }
 inline std::string* WebMessageInfo::mutable_participant() {
@@ -49977,57 +52148,67 @@ inline std::string* WebMessageInfo::mutable_participant() {
   return _s;
 }
 inline const std::string& WebMessageInfo::_internal_participant() const {
-  return participant_.Get();
+  return _impl_.participant_.Get();
 }
 inline void WebMessageInfo::_internal_set_participant(const std::string& value) {
-  _has_bits_[0] |= 0x00000001u;
-  participant_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  _impl_.participant_.Set(value, GetArenaForAllocation());
 }
 inline std::string* WebMessageInfo::_internal_mutable_participant() {
-  _has_bits_[0] |= 0x00000001u;
-  return participant_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000001u;
+  return _impl_.participant_.Mutable(GetArenaForAllocation());
 }
 inline std::string* WebMessageInfo::release_participant() {
   // @@protoc_insertion_point(field_release:proto.WebMessageInfo.participant)
   if (!_internal_has_participant()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000001u;
-  return participant_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000001u;
+  auto* p = _impl_.participant_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.participant_.IsDefault()) {
+    _impl_.participant_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void WebMessageInfo::set_allocated_participant(std::string* participant) {
   if (participant != nullptr) {
-    _has_bits_[0] |= 0x00000001u;
+    _impl_._has_bits_[0] |= 0x00000001u;
   } else {
-    _has_bits_[0] &= ~0x00000001u;
+    _impl_._has_bits_[0] &= ~0x00000001u;
   }
-  participant_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), participant,
-      GetArenaForAllocation());
+  _impl_.participant_.SetAllocated(participant, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.participant_.IsDefault()) {
+    _impl_.participant_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.WebMessageInfo.participant)
 }
 
 // optional bool ignore = 16;
 inline bool WebMessageInfo::_internal_has_ignore() const {
-  bool value = (_has_bits_[0] & 0x00000800u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000800u) != 0;
   return value;
 }
 inline bool WebMessageInfo::has_ignore() const {
   return _internal_has_ignore();
 }
 inline void WebMessageInfo::clear_ignore() {
-  ignore_ = false;
-  _has_bits_[0] &= ~0x00000800u;
+  _impl_.ignore_ = false;
+  _impl_._has_bits_[0] &= ~0x00000800u;
 }
 inline bool WebMessageInfo::_internal_ignore() const {
-  return ignore_;
+  return _impl_.ignore_;
 }
 inline bool WebMessageInfo::ignore() const {
   // @@protoc_insertion_point(field_get:proto.WebMessageInfo.ignore)
   return _internal_ignore();
 }
 inline void WebMessageInfo::_internal_set_ignore(bool value) {
-  _has_bits_[0] |= 0x00000800u;
-  ignore_ = value;
+  _impl_._has_bits_[0] |= 0x00000800u;
+  _impl_.ignore_ = value;
 }
 inline void WebMessageInfo::set_ignore(bool value) {
   _internal_set_ignore(value);
@@ -50036,26 +52217,26 @@ inline void WebMessageInfo::set_ignore(bool value) {
 
 // optional bool starred = 17;
 inline bool WebMessageInfo::_internal_has_starred() const {
-  bool value = (_has_bits_[0] & 0x00001000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00001000u) != 0;
   return value;
 }
 inline bool WebMessageInfo::has_starred() const {
   return _internal_has_starred();
 }
 inline void WebMessageInfo::clear_starred() {
-  starred_ = false;
-  _has_bits_[0] &= ~0x00001000u;
+  _impl_.starred_ = false;
+  _impl_._has_bits_[0] &= ~0x00001000u;
 }
 inline bool WebMessageInfo::_internal_starred() const {
-  return starred_;
+  return _impl_.starred_;
 }
 inline bool WebMessageInfo::starred() const {
   // @@protoc_insertion_point(field_get:proto.WebMessageInfo.starred)
   return _internal_starred();
 }
 inline void WebMessageInfo::_internal_set_starred(bool value) {
-  _has_bits_[0] |= 0x00001000u;
-  starred_ = value;
+  _impl_._has_bits_[0] |= 0x00001000u;
+  _impl_.starred_ = value;
 }
 inline void WebMessageInfo::set_starred(bool value) {
   _internal_set_starred(value);
@@ -50064,26 +52245,26 @@ inline void WebMessageInfo::set_starred(bool value) {
 
 // optional bool broadcast = 18;
 inline bool WebMessageInfo::_internal_has_broadcast() const {
-  bool value = (_has_bits_[0] & 0x00002000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00002000u) != 0;
   return value;
 }
 inline bool WebMessageInfo::has_broadcast() const {
   return _internal_has_broadcast();
 }
 inline void WebMessageInfo::clear_broadcast() {
-  broadcast_ = false;
-  _has_bits_[0] &= ~0x00002000u;
+  _impl_.broadcast_ = false;
+  _impl_._has_bits_[0] &= ~0x00002000u;
 }
 inline bool WebMessageInfo::_internal_broadcast() const {
-  return broadcast_;
+  return _impl_.broadcast_;
 }
 inline bool WebMessageInfo::broadcast() const {
   // @@protoc_insertion_point(field_get:proto.WebMessageInfo.broadcast)
   return _internal_broadcast();
 }
 inline void WebMessageInfo::_internal_set_broadcast(bool value) {
-  _has_bits_[0] |= 0x00002000u;
-  broadcast_ = value;
+  _impl_._has_bits_[0] |= 0x00002000u;
+  _impl_.broadcast_ = value;
 }
 inline void WebMessageInfo::set_broadcast(bool value) {
   _internal_set_broadcast(value);
@@ -50092,15 +52273,15 @@ inline void WebMessageInfo::set_broadcast(bool value) {
 
 // optional string pushName = 19;
 inline bool WebMessageInfo::_internal_has_pushname() const {
-  bool value = (_has_bits_[0] & 0x00000002u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000002u) != 0;
   return value;
 }
 inline bool WebMessageInfo::has_pushname() const {
   return _internal_has_pushname();
 }
 inline void WebMessageInfo::clear_pushname() {
-  pushname_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000002u;
+  _impl_.pushname_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000002u;
 }
 inline const std::string& WebMessageInfo::pushname() const {
   // @@protoc_insertion_point(field_get:proto.WebMessageInfo.pushName)
@@ -50109,8 +52290,8 @@ inline const std::string& WebMessageInfo::pushname() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void WebMessageInfo::set_pushname(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000002u;
- pushname_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000002u;
+ _impl_.pushname_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.WebMessageInfo.pushName)
 }
 inline std::string* WebMessageInfo::mutable_pushname() {
@@ -50119,46 +52300,56 @@ inline std::string* WebMessageInfo::mutable_pushname() {
   return _s;
 }
 inline const std::string& WebMessageInfo::_internal_pushname() const {
-  return pushname_.Get();
+  return _impl_.pushname_.Get();
 }
 inline void WebMessageInfo::_internal_set_pushname(const std::string& value) {
-  _has_bits_[0] |= 0x00000002u;
-  pushname_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  _impl_.pushname_.Set(value, GetArenaForAllocation());
 }
 inline std::string* WebMessageInfo::_internal_mutable_pushname() {
-  _has_bits_[0] |= 0x00000002u;
-  return pushname_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000002u;
+  return _impl_.pushname_.Mutable(GetArenaForAllocation());
 }
 inline std::string* WebMessageInfo::release_pushname() {
   // @@protoc_insertion_point(field_release:proto.WebMessageInfo.pushName)
   if (!_internal_has_pushname()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000002u;
-  return pushname_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000002u;
+  auto* p = _impl_.pushname_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.pushname_.IsDefault()) {
+    _impl_.pushname_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void WebMessageInfo::set_allocated_pushname(std::string* pushname) {
   if (pushname != nullptr) {
-    _has_bits_[0] |= 0x00000002u;
+    _impl_._has_bits_[0] |= 0x00000002u;
   } else {
-    _has_bits_[0] &= ~0x00000002u;
+    _impl_._has_bits_[0] &= ~0x00000002u;
   }
-  pushname_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), pushname,
-      GetArenaForAllocation());
+  _impl_.pushname_.SetAllocated(pushname, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.pushname_.IsDefault()) {
+    _impl_.pushname_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.WebMessageInfo.pushName)
 }
 
 // optional bytes mediaCiphertextSha256 = 20;
 inline bool WebMessageInfo::_internal_has_mediaciphertextsha256() const {
-  bool value = (_has_bits_[0] & 0x00000004u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000004u) != 0;
   return value;
 }
 inline bool WebMessageInfo::has_mediaciphertextsha256() const {
   return _internal_has_mediaciphertextsha256();
 }
 inline void WebMessageInfo::clear_mediaciphertextsha256() {
-  mediaciphertextsha256_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000004u;
+  _impl_.mediaciphertextsha256_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000004u;
 }
 inline const std::string& WebMessageInfo::mediaciphertextsha256() const {
   // @@protoc_insertion_point(field_get:proto.WebMessageInfo.mediaCiphertextSha256)
@@ -50167,8 +52358,8 @@ inline const std::string& WebMessageInfo::mediaciphertextsha256() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void WebMessageInfo::set_mediaciphertextsha256(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000004u;
- mediaciphertextsha256_.SetBytes(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000004u;
+ _impl_.mediaciphertextsha256_.SetBytes(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.WebMessageInfo.mediaCiphertextSha256)
 }
 inline std::string* WebMessageInfo::mutable_mediaciphertextsha256() {
@@ -50177,57 +52368,67 @@ inline std::string* WebMessageInfo::mutable_mediaciphertextsha256() {
   return _s;
 }
 inline const std::string& WebMessageInfo::_internal_mediaciphertextsha256() const {
-  return mediaciphertextsha256_.Get();
+  return _impl_.mediaciphertextsha256_.Get();
 }
 inline void WebMessageInfo::_internal_set_mediaciphertextsha256(const std::string& value) {
-  _has_bits_[0] |= 0x00000004u;
-  mediaciphertextsha256_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  _impl_.mediaciphertextsha256_.Set(value, GetArenaForAllocation());
 }
 inline std::string* WebMessageInfo::_internal_mutable_mediaciphertextsha256() {
-  _has_bits_[0] |= 0x00000004u;
-  return mediaciphertextsha256_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000004u;
+  return _impl_.mediaciphertextsha256_.Mutable(GetArenaForAllocation());
 }
 inline std::string* WebMessageInfo::release_mediaciphertextsha256() {
   // @@protoc_insertion_point(field_release:proto.WebMessageInfo.mediaCiphertextSha256)
   if (!_internal_has_mediaciphertextsha256()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000004u;
-  return mediaciphertextsha256_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000004u;
+  auto* p = _impl_.mediaciphertextsha256_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.mediaciphertextsha256_.IsDefault()) {
+    _impl_.mediaciphertextsha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void WebMessageInfo::set_allocated_mediaciphertextsha256(std::string* mediaciphertextsha256) {
   if (mediaciphertextsha256 != nullptr) {
-    _has_bits_[0] |= 0x00000004u;
+    _impl_._has_bits_[0] |= 0x00000004u;
   } else {
-    _has_bits_[0] &= ~0x00000004u;
+    _impl_._has_bits_[0] &= ~0x00000004u;
   }
-  mediaciphertextsha256_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), mediaciphertextsha256,
-      GetArenaForAllocation());
+  _impl_.mediaciphertextsha256_.SetAllocated(mediaciphertextsha256, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.mediaciphertextsha256_.IsDefault()) {
+    _impl_.mediaciphertextsha256_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.WebMessageInfo.mediaCiphertextSha256)
 }
 
 // optional bool multicast = 21;
 inline bool WebMessageInfo::_internal_has_multicast() const {
-  bool value = (_has_bits_[0] & 0x00004000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00004000u) != 0;
   return value;
 }
 inline bool WebMessageInfo::has_multicast() const {
   return _internal_has_multicast();
 }
 inline void WebMessageInfo::clear_multicast() {
-  multicast_ = false;
-  _has_bits_[0] &= ~0x00004000u;
+  _impl_.multicast_ = false;
+  _impl_._has_bits_[0] &= ~0x00004000u;
 }
 inline bool WebMessageInfo::_internal_multicast() const {
-  return multicast_;
+  return _impl_.multicast_;
 }
 inline bool WebMessageInfo::multicast() const {
   // @@protoc_insertion_point(field_get:proto.WebMessageInfo.multicast)
   return _internal_multicast();
 }
 inline void WebMessageInfo::_internal_set_multicast(bool value) {
-  _has_bits_[0] |= 0x00004000u;
-  multicast_ = value;
+  _impl_._has_bits_[0] |= 0x00004000u;
+  _impl_.multicast_ = value;
 }
 inline void WebMessageInfo::set_multicast(bool value) {
   _internal_set_multicast(value);
@@ -50236,26 +52437,26 @@ inline void WebMessageInfo::set_multicast(bool value) {
 
 // optional bool urlText = 22;
 inline bool WebMessageInfo::_internal_has_urltext() const {
-  bool value = (_has_bits_[0] & 0x00010000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00010000u) != 0;
   return value;
 }
 inline bool WebMessageInfo::has_urltext() const {
   return _internal_has_urltext();
 }
 inline void WebMessageInfo::clear_urltext() {
-  urltext_ = false;
-  _has_bits_[0] &= ~0x00010000u;
+  _impl_.urltext_ = false;
+  _impl_._has_bits_[0] &= ~0x00010000u;
 }
 inline bool WebMessageInfo::_internal_urltext() const {
-  return urltext_;
+  return _impl_.urltext_;
 }
 inline bool WebMessageInfo::urltext() const {
   // @@protoc_insertion_point(field_get:proto.WebMessageInfo.urlText)
   return _internal_urltext();
 }
 inline void WebMessageInfo::_internal_set_urltext(bool value) {
-  _has_bits_[0] |= 0x00010000u;
-  urltext_ = value;
+  _impl_._has_bits_[0] |= 0x00010000u;
+  _impl_.urltext_ = value;
 }
 inline void WebMessageInfo::set_urltext(bool value) {
   _internal_set_urltext(value);
@@ -50264,26 +52465,26 @@ inline void WebMessageInfo::set_urltext(bool value) {
 
 // optional bool urlNumber = 23;
 inline bool WebMessageInfo::_internal_has_urlnumber() const {
-  bool value = (_has_bits_[0] & 0x00020000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00020000u) != 0;
   return value;
 }
 inline bool WebMessageInfo::has_urlnumber() const {
   return _internal_has_urlnumber();
 }
 inline void WebMessageInfo::clear_urlnumber() {
-  urlnumber_ = false;
-  _has_bits_[0] &= ~0x00020000u;
+  _impl_.urlnumber_ = false;
+  _impl_._has_bits_[0] &= ~0x00020000u;
 }
 inline bool WebMessageInfo::_internal_urlnumber() const {
-  return urlnumber_;
+  return _impl_.urlnumber_;
 }
 inline bool WebMessageInfo::urlnumber() const {
   // @@protoc_insertion_point(field_get:proto.WebMessageInfo.urlNumber)
   return _internal_urlnumber();
 }
 inline void WebMessageInfo::_internal_set_urlnumber(bool value) {
-  _has_bits_[0] |= 0x00020000u;
-  urlnumber_ = value;
+  _impl_._has_bits_[0] |= 0x00020000u;
+  _impl_.urlnumber_ = value;
 }
 inline void WebMessageInfo::set_urlnumber(bool value) {
   _internal_set_urlnumber(value);
@@ -50292,18 +52493,18 @@ inline void WebMessageInfo::set_urlnumber(bool value) {
 
 // optional .proto.WebMessageInfo.WebMessageInfoStubType messageStubType = 24;
 inline bool WebMessageInfo::_internal_has_messagestubtype() const {
-  bool value = (_has_bits_[0] & 0x00008000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00008000u) != 0;
   return value;
 }
 inline bool WebMessageInfo::has_messagestubtype() const {
   return _internal_has_messagestubtype();
 }
 inline void WebMessageInfo::clear_messagestubtype() {
-  messagestubtype_ = 0;
-  _has_bits_[0] &= ~0x00008000u;
+  _impl_.messagestubtype_ = 0;
+  _impl_._has_bits_[0] &= ~0x00008000u;
 }
 inline ::proto::WebMessageInfo_WebMessageInfoStubType WebMessageInfo::_internal_messagestubtype() const {
-  return static_cast< ::proto::WebMessageInfo_WebMessageInfoStubType >(messagestubtype_);
+  return static_cast< ::proto::WebMessageInfo_WebMessageInfoStubType >(_impl_.messagestubtype_);
 }
 inline ::proto::WebMessageInfo_WebMessageInfoStubType WebMessageInfo::messagestubtype() const {
   // @@protoc_insertion_point(field_get:proto.WebMessageInfo.messageStubType)
@@ -50311,8 +52512,8 @@ inline ::proto::WebMessageInfo_WebMessageInfoStubType WebMessageInfo::messagestu
 }
 inline void WebMessageInfo::_internal_set_messagestubtype(::proto::WebMessageInfo_WebMessageInfoStubType value) {
   assert(::proto::WebMessageInfo_WebMessageInfoStubType_IsValid(value));
-  _has_bits_[0] |= 0x00008000u;
-  messagestubtype_ = value;
+  _impl_._has_bits_[0] |= 0x00008000u;
+  _impl_.messagestubtype_ = value;
 }
 inline void WebMessageInfo::set_messagestubtype(::proto::WebMessageInfo_WebMessageInfoStubType value) {
   _internal_set_messagestubtype(value);
@@ -50321,26 +52522,26 @@ inline void WebMessageInfo::set_messagestubtype(::proto::WebMessageInfo_WebMessa
 
 // optional bool clearMedia = 25;
 inline bool WebMessageInfo::_internal_has_clearmedia() const {
-  bool value = (_has_bits_[0] & 0x00040000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00040000u) != 0;
   return value;
 }
 inline bool WebMessageInfo::has_clearmedia() const {
   return _internal_has_clearmedia();
 }
 inline void WebMessageInfo::clear_clearmedia() {
-  clearmedia_ = false;
-  _has_bits_[0] &= ~0x00040000u;
+  _impl_.clearmedia_ = false;
+  _impl_._has_bits_[0] &= ~0x00040000u;
 }
 inline bool WebMessageInfo::_internal_clearmedia() const {
-  return clearmedia_;
+  return _impl_.clearmedia_;
 }
 inline bool WebMessageInfo::clearmedia() const {
   // @@protoc_insertion_point(field_get:proto.WebMessageInfo.clearMedia)
   return _internal_clearmedia();
 }
 inline void WebMessageInfo::_internal_set_clearmedia(bool value) {
-  _has_bits_[0] |= 0x00040000u;
-  clearmedia_ = value;
+  _impl_._has_bits_[0] |= 0x00040000u;
+  _impl_.clearmedia_ = value;
 }
 inline void WebMessageInfo::set_clearmedia(bool value) {
   _internal_set_clearmedia(value);
@@ -50349,13 +52550,13 @@ inline void WebMessageInfo::set_clearmedia(bool value) {
 
 // repeated string messageStubParameters = 26;
 inline int WebMessageInfo::_internal_messagestubparameters_size() const {
-  return messagestubparameters_.size();
+  return _impl_.messagestubparameters_.size();
 }
 inline int WebMessageInfo::messagestubparameters_size() const {
   return _internal_messagestubparameters_size();
 }
 inline void WebMessageInfo::clear_messagestubparameters() {
-  messagestubparameters_.Clear();
+  _impl_.messagestubparameters_.Clear();
 }
 inline std::string* WebMessageInfo::add_messagestubparameters() {
   std::string* _s = _internal_add_messagestubparameters();
@@ -50363,7 +52564,7 @@ inline std::string* WebMessageInfo::add_messagestubparameters() {
   return _s;
 }
 inline const std::string& WebMessageInfo::_internal_messagestubparameters(int index) const {
-  return messagestubparameters_.Get(index);
+  return _impl_.messagestubparameters_.Get(index);
 }
 inline const std::string& WebMessageInfo::messagestubparameters(int index) const {
   // @@protoc_insertion_point(field_get:proto.WebMessageInfo.messageStubParameters)
@@ -50371,94 +52572,94 @@ inline const std::string& WebMessageInfo::messagestubparameters(int index) const
 }
 inline std::string* WebMessageInfo::mutable_messagestubparameters(int index) {
   // @@protoc_insertion_point(field_mutable:proto.WebMessageInfo.messageStubParameters)
-  return messagestubparameters_.Mutable(index);
+  return _impl_.messagestubparameters_.Mutable(index);
 }
 inline void WebMessageInfo::set_messagestubparameters(int index, const std::string& value) {
-  messagestubparameters_.Mutable(index)->assign(value);
+  _impl_.messagestubparameters_.Mutable(index)->assign(value);
   // @@protoc_insertion_point(field_set:proto.WebMessageInfo.messageStubParameters)
 }
 inline void WebMessageInfo::set_messagestubparameters(int index, std::string&& value) {
-  messagestubparameters_.Mutable(index)->assign(std::move(value));
+  _impl_.messagestubparameters_.Mutable(index)->assign(std::move(value));
   // @@protoc_insertion_point(field_set:proto.WebMessageInfo.messageStubParameters)
 }
 inline void WebMessageInfo::set_messagestubparameters(int index, const char* value) {
   GOOGLE_DCHECK(value != nullptr);
-  messagestubparameters_.Mutable(index)->assign(value);
+  _impl_.messagestubparameters_.Mutable(index)->assign(value);
   // @@protoc_insertion_point(field_set_char:proto.WebMessageInfo.messageStubParameters)
 }
 inline void WebMessageInfo::set_messagestubparameters(int index, const char* value, size_t size) {
-  messagestubparameters_.Mutable(index)->assign(
+  _impl_.messagestubparameters_.Mutable(index)->assign(
     reinterpret_cast<const char*>(value), size);
   // @@protoc_insertion_point(field_set_pointer:proto.WebMessageInfo.messageStubParameters)
 }
 inline std::string* WebMessageInfo::_internal_add_messagestubparameters() {
-  return messagestubparameters_.Add();
+  return _impl_.messagestubparameters_.Add();
 }
 inline void WebMessageInfo::add_messagestubparameters(const std::string& value) {
-  messagestubparameters_.Add()->assign(value);
+  _impl_.messagestubparameters_.Add()->assign(value);
   // @@protoc_insertion_point(field_add:proto.WebMessageInfo.messageStubParameters)
 }
 inline void WebMessageInfo::add_messagestubparameters(std::string&& value) {
-  messagestubparameters_.Add(std::move(value));
+  _impl_.messagestubparameters_.Add(std::move(value));
   // @@protoc_insertion_point(field_add:proto.WebMessageInfo.messageStubParameters)
 }
 inline void WebMessageInfo::add_messagestubparameters(const char* value) {
   GOOGLE_DCHECK(value != nullptr);
-  messagestubparameters_.Add()->assign(value);
+  _impl_.messagestubparameters_.Add()->assign(value);
   // @@protoc_insertion_point(field_add_char:proto.WebMessageInfo.messageStubParameters)
 }
 inline void WebMessageInfo::add_messagestubparameters(const char* value, size_t size) {
-  messagestubparameters_.Add()->assign(reinterpret_cast<const char*>(value), size);
+  _impl_.messagestubparameters_.Add()->assign(reinterpret_cast<const char*>(value), size);
   // @@protoc_insertion_point(field_add_pointer:proto.WebMessageInfo.messageStubParameters)
 }
 inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>&
 WebMessageInfo::messagestubparameters() const {
   // @@protoc_insertion_point(field_list:proto.WebMessageInfo.messageStubParameters)
-  return messagestubparameters_;
+  return _impl_.messagestubparameters_;
 }
 inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>*
 WebMessageInfo::mutable_messagestubparameters() {
   // @@protoc_insertion_point(field_mutable_list:proto.WebMessageInfo.messageStubParameters)
-  return &messagestubparameters_;
+  return &_impl_.messagestubparameters_;
 }
 
 // optional uint32 duration = 27;
 inline bool WebMessageInfo::_internal_has_duration() const {
-  bool value = (_has_bits_[0] & 0x00100000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00100000u) != 0;
   return value;
 }
 inline bool WebMessageInfo::has_duration() const {
   return _internal_has_duration();
 }
 inline void WebMessageInfo::clear_duration() {
-  duration_ = 0u;
-  _has_bits_[0] &= ~0x00100000u;
+  _impl_.duration_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00100000u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 WebMessageInfo::_internal_duration() const {
-  return duration_;
+inline uint32_t WebMessageInfo::_internal_duration() const {
+  return _impl_.duration_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 WebMessageInfo::duration() const {
+inline uint32_t WebMessageInfo::duration() const {
   // @@protoc_insertion_point(field_get:proto.WebMessageInfo.duration)
   return _internal_duration();
 }
-inline void WebMessageInfo::_internal_set_duration(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00100000u;
-  duration_ = value;
+inline void WebMessageInfo::_internal_set_duration(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00100000u;
+  _impl_.duration_ = value;
 }
-inline void WebMessageInfo::set_duration(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void WebMessageInfo::set_duration(uint32_t value) {
   _internal_set_duration(value);
   // @@protoc_insertion_point(field_set:proto.WebMessageInfo.duration)
 }
 
 // repeated string labels = 28;
 inline int WebMessageInfo::_internal_labels_size() const {
-  return labels_.size();
+  return _impl_.labels_.size();
 }
 inline int WebMessageInfo::labels_size() const {
   return _internal_labels_size();
 }
 inline void WebMessageInfo::clear_labels() {
-  labels_.Clear();
+  _impl_.labels_.Clear();
 }
 inline std::string* WebMessageInfo::add_labels() {
   std::string* _s = _internal_add_labels();
@@ -50466,7 +52667,7 @@ inline std::string* WebMessageInfo::add_labels() {
   return _s;
 }
 inline const std::string& WebMessageInfo::_internal_labels(int index) const {
-  return labels_.Get(index);
+  return _impl_.labels_.Get(index);
 }
 inline const std::string& WebMessageInfo::labels(int index) const {
   // @@protoc_insertion_point(field_get:proto.WebMessageInfo.labels)
@@ -50474,72 +52675,72 @@ inline const std::string& WebMessageInfo::labels(int index) const {
 }
 inline std::string* WebMessageInfo::mutable_labels(int index) {
   // @@protoc_insertion_point(field_mutable:proto.WebMessageInfo.labels)
-  return labels_.Mutable(index);
+  return _impl_.labels_.Mutable(index);
 }
 inline void WebMessageInfo::set_labels(int index, const std::string& value) {
-  labels_.Mutable(index)->assign(value);
+  _impl_.labels_.Mutable(index)->assign(value);
   // @@protoc_insertion_point(field_set:proto.WebMessageInfo.labels)
 }
 inline void WebMessageInfo::set_labels(int index, std::string&& value) {
-  labels_.Mutable(index)->assign(std::move(value));
+  _impl_.labels_.Mutable(index)->assign(std::move(value));
   // @@protoc_insertion_point(field_set:proto.WebMessageInfo.labels)
 }
 inline void WebMessageInfo::set_labels(int index, const char* value) {
   GOOGLE_DCHECK(value != nullptr);
-  labels_.Mutable(index)->assign(value);
+  _impl_.labels_.Mutable(index)->assign(value);
   // @@protoc_insertion_point(field_set_char:proto.WebMessageInfo.labels)
 }
 inline void WebMessageInfo::set_labels(int index, const char* value, size_t size) {
-  labels_.Mutable(index)->assign(
+  _impl_.labels_.Mutable(index)->assign(
     reinterpret_cast<const char*>(value), size);
   // @@protoc_insertion_point(field_set_pointer:proto.WebMessageInfo.labels)
 }
 inline std::string* WebMessageInfo::_internal_add_labels() {
-  return labels_.Add();
+  return _impl_.labels_.Add();
 }
 inline void WebMessageInfo::add_labels(const std::string& value) {
-  labels_.Add()->assign(value);
+  _impl_.labels_.Add()->assign(value);
   // @@protoc_insertion_point(field_add:proto.WebMessageInfo.labels)
 }
 inline void WebMessageInfo::add_labels(std::string&& value) {
-  labels_.Add(std::move(value));
+  _impl_.labels_.Add(std::move(value));
   // @@protoc_insertion_point(field_add:proto.WebMessageInfo.labels)
 }
 inline void WebMessageInfo::add_labels(const char* value) {
   GOOGLE_DCHECK(value != nullptr);
-  labels_.Add()->assign(value);
+  _impl_.labels_.Add()->assign(value);
   // @@protoc_insertion_point(field_add_char:proto.WebMessageInfo.labels)
 }
 inline void WebMessageInfo::add_labels(const char* value, size_t size) {
-  labels_.Add()->assign(reinterpret_cast<const char*>(value), size);
+  _impl_.labels_.Add()->assign(reinterpret_cast<const char*>(value), size);
   // @@protoc_insertion_point(field_add_pointer:proto.WebMessageInfo.labels)
 }
 inline const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>&
 WebMessageInfo::labels() const {
   // @@protoc_insertion_point(field_list:proto.WebMessageInfo.labels)
-  return labels_;
+  return _impl_.labels_;
 }
 inline ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField<std::string>*
 WebMessageInfo::mutable_labels() {
   // @@protoc_insertion_point(field_mutable_list:proto.WebMessageInfo.labels)
-  return &labels_;
+  return &_impl_.labels_;
 }
 
 // optional .proto.PaymentInfo paymentInfo = 29;
 inline bool WebMessageInfo::_internal_has_paymentinfo() const {
-  bool value = (_has_bits_[0] & 0x00000040u) != 0;
-  PROTOBUF_ASSUME(!value || paymentinfo_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000040u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.paymentinfo_ != nullptr);
   return value;
 }
 inline bool WebMessageInfo::has_paymentinfo() const {
   return _internal_has_paymentinfo();
 }
 inline void WebMessageInfo::clear_paymentinfo() {
-  if (paymentinfo_ != nullptr) paymentinfo_->Clear();
-  _has_bits_[0] &= ~0x00000040u;
+  if (_impl_.paymentinfo_ != nullptr) _impl_.paymentinfo_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000040u;
 }
 inline const ::proto::PaymentInfo& WebMessageInfo::_internal_paymentinfo() const {
-  const ::proto::PaymentInfo* p = paymentinfo_;
+  const ::proto::PaymentInfo* p = _impl_.paymentinfo_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::PaymentInfo&>(
       ::proto::_PaymentInfo_default_instance_);
 }
@@ -50550,20 +52751,20 @@ inline const ::proto::PaymentInfo& WebMessageInfo::paymentinfo() const {
 inline void WebMessageInfo::unsafe_arena_set_allocated_paymentinfo(
     ::proto::PaymentInfo* paymentinfo) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(paymentinfo_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.paymentinfo_);
   }
-  paymentinfo_ = paymentinfo;
+  _impl_.paymentinfo_ = paymentinfo;
   if (paymentinfo) {
-    _has_bits_[0] |= 0x00000040u;
+    _impl_._has_bits_[0] |= 0x00000040u;
   } else {
-    _has_bits_[0] &= ~0x00000040u;
+    _impl_._has_bits_[0] &= ~0x00000040u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.WebMessageInfo.paymentInfo)
 }
 inline ::proto::PaymentInfo* WebMessageInfo::release_paymentinfo() {
-  _has_bits_[0] &= ~0x00000040u;
-  ::proto::PaymentInfo* temp = paymentinfo_;
-  paymentinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000040u;
+  ::proto::PaymentInfo* temp = _impl_.paymentinfo_;
+  _impl_.paymentinfo_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -50577,18 +52778,18 @@ inline ::proto::PaymentInfo* WebMessageInfo::release_paymentinfo() {
 }
 inline ::proto::PaymentInfo* WebMessageInfo::unsafe_arena_release_paymentinfo() {
   // @@protoc_insertion_point(field_release:proto.WebMessageInfo.paymentInfo)
-  _has_bits_[0] &= ~0x00000040u;
-  ::proto::PaymentInfo* temp = paymentinfo_;
-  paymentinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000040u;
+  ::proto::PaymentInfo* temp = _impl_.paymentinfo_;
+  _impl_.paymentinfo_ = nullptr;
   return temp;
 }
 inline ::proto::PaymentInfo* WebMessageInfo::_internal_mutable_paymentinfo() {
-  _has_bits_[0] |= 0x00000040u;
-  if (paymentinfo_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000040u;
+  if (_impl_.paymentinfo_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::PaymentInfo>(GetArenaForAllocation());
-    paymentinfo_ = p;
+    _impl_.paymentinfo_ = p;
   }
-  return paymentinfo_;
+  return _impl_.paymentinfo_;
 }
 inline ::proto::PaymentInfo* WebMessageInfo::mutable_paymentinfo() {
   ::proto::PaymentInfo* _msg = _internal_mutable_paymentinfo();
@@ -50598,38 +52799,38 @@ inline ::proto::PaymentInfo* WebMessageInfo::mutable_paymentinfo() {
 inline void WebMessageInfo::set_allocated_paymentinfo(::proto::PaymentInfo* paymentinfo) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete paymentinfo_;
+    delete _impl_.paymentinfo_;
   }
   if (paymentinfo) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::PaymentInfo>::GetOwningArena(paymentinfo);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(paymentinfo);
     if (message_arena != submessage_arena) {
       paymentinfo = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, paymentinfo, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000040u;
+    _impl_._has_bits_[0] |= 0x00000040u;
   } else {
-    _has_bits_[0] &= ~0x00000040u;
+    _impl_._has_bits_[0] &= ~0x00000040u;
   }
-  paymentinfo_ = paymentinfo;
+  _impl_.paymentinfo_ = paymentinfo;
   // @@protoc_insertion_point(field_set_allocated:proto.WebMessageInfo.paymentInfo)
 }
 
 // optional .proto.LiveLocationMessage finalLiveLocation = 30;
 inline bool WebMessageInfo::_internal_has_finallivelocation() const {
-  bool value = (_has_bits_[0] & 0x00000080u) != 0;
-  PROTOBUF_ASSUME(!value || finallivelocation_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000080u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.finallivelocation_ != nullptr);
   return value;
 }
 inline bool WebMessageInfo::has_finallivelocation() const {
   return _internal_has_finallivelocation();
 }
 inline void WebMessageInfo::clear_finallivelocation() {
-  if (finallivelocation_ != nullptr) finallivelocation_->Clear();
-  _has_bits_[0] &= ~0x00000080u;
+  if (_impl_.finallivelocation_ != nullptr) _impl_.finallivelocation_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000080u;
 }
 inline const ::proto::LiveLocationMessage& WebMessageInfo::_internal_finallivelocation() const {
-  const ::proto::LiveLocationMessage* p = finallivelocation_;
+  const ::proto::LiveLocationMessage* p = _impl_.finallivelocation_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::LiveLocationMessage&>(
       ::proto::_LiveLocationMessage_default_instance_);
 }
@@ -50640,20 +52841,20 @@ inline const ::proto::LiveLocationMessage& WebMessageInfo::finallivelocation() c
 inline void WebMessageInfo::unsafe_arena_set_allocated_finallivelocation(
     ::proto::LiveLocationMessage* finallivelocation) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(finallivelocation_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.finallivelocation_);
   }
-  finallivelocation_ = finallivelocation;
+  _impl_.finallivelocation_ = finallivelocation;
   if (finallivelocation) {
-    _has_bits_[0] |= 0x00000080u;
+    _impl_._has_bits_[0] |= 0x00000080u;
   } else {
-    _has_bits_[0] &= ~0x00000080u;
+    _impl_._has_bits_[0] &= ~0x00000080u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.WebMessageInfo.finalLiveLocation)
 }
 inline ::proto::LiveLocationMessage* WebMessageInfo::release_finallivelocation() {
-  _has_bits_[0] &= ~0x00000080u;
-  ::proto::LiveLocationMessage* temp = finallivelocation_;
-  finallivelocation_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000080u;
+  ::proto::LiveLocationMessage* temp = _impl_.finallivelocation_;
+  _impl_.finallivelocation_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -50667,18 +52868,18 @@ inline ::proto::LiveLocationMessage* WebMessageInfo::release_finallivelocation()
 }
 inline ::proto::LiveLocationMessage* WebMessageInfo::unsafe_arena_release_finallivelocation() {
   // @@protoc_insertion_point(field_release:proto.WebMessageInfo.finalLiveLocation)
-  _has_bits_[0] &= ~0x00000080u;
-  ::proto::LiveLocationMessage* temp = finallivelocation_;
-  finallivelocation_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000080u;
+  ::proto::LiveLocationMessage* temp = _impl_.finallivelocation_;
+  _impl_.finallivelocation_ = nullptr;
   return temp;
 }
 inline ::proto::LiveLocationMessage* WebMessageInfo::_internal_mutable_finallivelocation() {
-  _has_bits_[0] |= 0x00000080u;
-  if (finallivelocation_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000080u;
+  if (_impl_.finallivelocation_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::LiveLocationMessage>(GetArenaForAllocation());
-    finallivelocation_ = p;
+    _impl_.finallivelocation_ = p;
   }
-  return finallivelocation_;
+  return _impl_.finallivelocation_;
 }
 inline ::proto::LiveLocationMessage* WebMessageInfo::mutable_finallivelocation() {
   ::proto::LiveLocationMessage* _msg = _internal_mutable_finallivelocation();
@@ -50688,38 +52889,38 @@ inline ::proto::LiveLocationMessage* WebMessageInfo::mutable_finallivelocation()
 inline void WebMessageInfo::set_allocated_finallivelocation(::proto::LiveLocationMessage* finallivelocation) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete finallivelocation_;
+    delete _impl_.finallivelocation_;
   }
   if (finallivelocation) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::LiveLocationMessage>::GetOwningArena(finallivelocation);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(finallivelocation);
     if (message_arena != submessage_arena) {
       finallivelocation = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, finallivelocation, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000080u;
+    _impl_._has_bits_[0] |= 0x00000080u;
   } else {
-    _has_bits_[0] &= ~0x00000080u;
+    _impl_._has_bits_[0] &= ~0x00000080u;
   }
-  finallivelocation_ = finallivelocation;
+  _impl_.finallivelocation_ = finallivelocation;
   // @@protoc_insertion_point(field_set_allocated:proto.WebMessageInfo.finalLiveLocation)
 }
 
 // optional .proto.PaymentInfo quotedPaymentInfo = 31;
 inline bool WebMessageInfo::_internal_has_quotedpaymentinfo() const {
-  bool value = (_has_bits_[0] & 0x00000100u) != 0;
-  PROTOBUF_ASSUME(!value || quotedpaymentinfo_ != nullptr);
+  bool value = (_impl_._has_bits_[0] & 0x00000100u) != 0;
+  PROTOBUF_ASSUME(!value || _impl_.quotedpaymentinfo_ != nullptr);
   return value;
 }
 inline bool WebMessageInfo::has_quotedpaymentinfo() const {
   return _internal_has_quotedpaymentinfo();
 }
 inline void WebMessageInfo::clear_quotedpaymentinfo() {
-  if (quotedpaymentinfo_ != nullptr) quotedpaymentinfo_->Clear();
-  _has_bits_[0] &= ~0x00000100u;
+  if (_impl_.quotedpaymentinfo_ != nullptr) _impl_.quotedpaymentinfo_->Clear();
+  _impl_._has_bits_[0] &= ~0x00000100u;
 }
 inline const ::proto::PaymentInfo& WebMessageInfo::_internal_quotedpaymentinfo() const {
-  const ::proto::PaymentInfo* p = quotedpaymentinfo_;
+  const ::proto::PaymentInfo* p = _impl_.quotedpaymentinfo_;
   return p != nullptr ? *p : reinterpret_cast<const ::proto::PaymentInfo&>(
       ::proto::_PaymentInfo_default_instance_);
 }
@@ -50730,20 +52931,20 @@ inline const ::proto::PaymentInfo& WebMessageInfo::quotedpaymentinfo() const {
 inline void WebMessageInfo::unsafe_arena_set_allocated_quotedpaymentinfo(
     ::proto::PaymentInfo* quotedpaymentinfo) {
   if (GetArenaForAllocation() == nullptr) {
-    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(quotedpaymentinfo_);
+    delete reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(_impl_.quotedpaymentinfo_);
   }
-  quotedpaymentinfo_ = quotedpaymentinfo;
+  _impl_.quotedpaymentinfo_ = quotedpaymentinfo;
   if (quotedpaymentinfo) {
-    _has_bits_[0] |= 0x00000100u;
+    _impl_._has_bits_[0] |= 0x00000100u;
   } else {
-    _has_bits_[0] &= ~0x00000100u;
+    _impl_._has_bits_[0] &= ~0x00000100u;
   }
   // @@protoc_insertion_point(field_unsafe_arena_set_allocated:proto.WebMessageInfo.quotedPaymentInfo)
 }
 inline ::proto::PaymentInfo* WebMessageInfo::release_quotedpaymentinfo() {
-  _has_bits_[0] &= ~0x00000100u;
-  ::proto::PaymentInfo* temp = quotedpaymentinfo_;
-  quotedpaymentinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000100u;
+  ::proto::PaymentInfo* temp = _impl_.quotedpaymentinfo_;
+  _impl_.quotedpaymentinfo_ = nullptr;
 #ifdef PROTOBUF_FORCE_COPY_IN_RELEASE
   auto* old =  reinterpret_cast<::PROTOBUF_NAMESPACE_ID::MessageLite*>(temp);
   temp = ::PROTOBUF_NAMESPACE_ID::internal::DuplicateIfNonNull(temp);
@@ -50757,18 +52958,18 @@ inline ::proto::PaymentInfo* WebMessageInfo::release_quotedpaymentinfo() {
 }
 inline ::proto::PaymentInfo* WebMessageInfo::unsafe_arena_release_quotedpaymentinfo() {
   // @@protoc_insertion_point(field_release:proto.WebMessageInfo.quotedPaymentInfo)
-  _has_bits_[0] &= ~0x00000100u;
-  ::proto::PaymentInfo* temp = quotedpaymentinfo_;
-  quotedpaymentinfo_ = nullptr;
+  _impl_._has_bits_[0] &= ~0x00000100u;
+  ::proto::PaymentInfo* temp = _impl_.quotedpaymentinfo_;
+  _impl_.quotedpaymentinfo_ = nullptr;
   return temp;
 }
 inline ::proto::PaymentInfo* WebMessageInfo::_internal_mutable_quotedpaymentinfo() {
-  _has_bits_[0] |= 0x00000100u;
-  if (quotedpaymentinfo_ == nullptr) {
+  _impl_._has_bits_[0] |= 0x00000100u;
+  if (_impl_.quotedpaymentinfo_ == nullptr) {
     auto* p = CreateMaybeMessage<::proto::PaymentInfo>(GetArenaForAllocation());
-    quotedpaymentinfo_ = p;
+    _impl_.quotedpaymentinfo_ = p;
   }
-  return quotedpaymentinfo_;
+  return _impl_.quotedpaymentinfo_;
 }
 inline ::proto::PaymentInfo* WebMessageInfo::mutable_quotedpaymentinfo() {
   ::proto::PaymentInfo* _msg = _internal_mutable_quotedpaymentinfo();
@@ -50778,101 +52979,101 @@ inline ::proto::PaymentInfo* WebMessageInfo::mutable_quotedpaymentinfo() {
 inline void WebMessageInfo::set_allocated_quotedpaymentinfo(::proto::PaymentInfo* quotedpaymentinfo) {
   ::PROTOBUF_NAMESPACE_ID::Arena* message_arena = GetArenaForAllocation();
   if (message_arena == nullptr) {
-    delete quotedpaymentinfo_;
+    delete _impl_.quotedpaymentinfo_;
   }
   if (quotedpaymentinfo) {
     ::PROTOBUF_NAMESPACE_ID::Arena* submessage_arena =
-        ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper<::proto::PaymentInfo>::GetOwningArena(quotedpaymentinfo);
+        ::PROTOBUF_NAMESPACE_ID::Arena::InternalGetOwningArena(quotedpaymentinfo);
     if (message_arena != submessage_arena) {
       quotedpaymentinfo = ::PROTOBUF_NAMESPACE_ID::internal::GetOwnedMessage(
           message_arena, quotedpaymentinfo, submessage_arena);
     }
-    _has_bits_[0] |= 0x00000100u;
+    _impl_._has_bits_[0] |= 0x00000100u;
   } else {
-    _has_bits_[0] &= ~0x00000100u;
+    _impl_._has_bits_[0] &= ~0x00000100u;
   }
-  quotedpaymentinfo_ = quotedpaymentinfo;
+  _impl_.quotedpaymentinfo_ = quotedpaymentinfo;
   // @@protoc_insertion_point(field_set_allocated:proto.WebMessageInfo.quotedPaymentInfo)
 }
 
 // optional uint64 ephemeralStartTimestamp = 32;
 inline bool WebMessageInfo::_internal_has_ephemeralstarttimestamp() const {
-  bool value = (_has_bits_[0] & 0x00400000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00400000u) != 0;
   return value;
 }
 inline bool WebMessageInfo::has_ephemeralstarttimestamp() const {
   return _internal_has_ephemeralstarttimestamp();
 }
 inline void WebMessageInfo::clear_ephemeralstarttimestamp() {
-  ephemeralstarttimestamp_ = uint64_t{0u};
-  _has_bits_[0] &= ~0x00400000u;
+  _impl_.ephemeralstarttimestamp_ = uint64_t{0u};
+  _impl_._has_bits_[0] &= ~0x00400000u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 WebMessageInfo::_internal_ephemeralstarttimestamp() const {
-  return ephemeralstarttimestamp_;
+inline uint64_t WebMessageInfo::_internal_ephemeralstarttimestamp() const {
+  return _impl_.ephemeralstarttimestamp_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint64 WebMessageInfo::ephemeralstarttimestamp() const {
+inline uint64_t WebMessageInfo::ephemeralstarttimestamp() const {
   // @@protoc_insertion_point(field_get:proto.WebMessageInfo.ephemeralStartTimestamp)
   return _internal_ephemeralstarttimestamp();
 }
-inline void WebMessageInfo::_internal_set_ephemeralstarttimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value) {
-  _has_bits_[0] |= 0x00400000u;
-  ephemeralstarttimestamp_ = value;
+inline void WebMessageInfo::_internal_set_ephemeralstarttimestamp(uint64_t value) {
+  _impl_._has_bits_[0] |= 0x00400000u;
+  _impl_.ephemeralstarttimestamp_ = value;
 }
-inline void WebMessageInfo::set_ephemeralstarttimestamp(::PROTOBUF_NAMESPACE_ID::uint64 value) {
+inline void WebMessageInfo::set_ephemeralstarttimestamp(uint64_t value) {
   _internal_set_ephemeralstarttimestamp(value);
   // @@protoc_insertion_point(field_set:proto.WebMessageInfo.ephemeralStartTimestamp)
 }
 
 // optional uint32 ephemeralDuration = 33;
 inline bool WebMessageInfo::_internal_has_ephemeralduration() const {
-  bool value = (_has_bits_[0] & 0x00200000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00200000u) != 0;
   return value;
 }
 inline bool WebMessageInfo::has_ephemeralduration() const {
   return _internal_has_ephemeralduration();
 }
 inline void WebMessageInfo::clear_ephemeralduration() {
-  ephemeralduration_ = 0u;
-  _has_bits_[0] &= ~0x00200000u;
+  _impl_.ephemeralduration_ = 0u;
+  _impl_._has_bits_[0] &= ~0x00200000u;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 WebMessageInfo::_internal_ephemeralduration() const {
-  return ephemeralduration_;
+inline uint32_t WebMessageInfo::_internal_ephemeralduration() const {
+  return _impl_.ephemeralduration_;
 }
-inline ::PROTOBUF_NAMESPACE_ID::uint32 WebMessageInfo::ephemeralduration() const {
+inline uint32_t WebMessageInfo::ephemeralduration() const {
   // @@protoc_insertion_point(field_get:proto.WebMessageInfo.ephemeralDuration)
   return _internal_ephemeralduration();
 }
-inline void WebMessageInfo::_internal_set_ephemeralduration(::PROTOBUF_NAMESPACE_ID::uint32 value) {
-  _has_bits_[0] |= 0x00200000u;
-  ephemeralduration_ = value;
+inline void WebMessageInfo::_internal_set_ephemeralduration(uint32_t value) {
+  _impl_._has_bits_[0] |= 0x00200000u;
+  _impl_.ephemeralduration_ = value;
 }
-inline void WebMessageInfo::set_ephemeralduration(::PROTOBUF_NAMESPACE_ID::uint32 value) {
+inline void WebMessageInfo::set_ephemeralduration(uint32_t value) {
   _internal_set_ephemeralduration(value);
   // @@protoc_insertion_point(field_set:proto.WebMessageInfo.ephemeralDuration)
 }
 
 // optional bool ephemeralOffToOn = 34;
 inline bool WebMessageInfo::_internal_has_ephemeralofftoon() const {
-  bool value = (_has_bits_[0] & 0x00080000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00080000u) != 0;
   return value;
 }
 inline bool WebMessageInfo::has_ephemeralofftoon() const {
   return _internal_has_ephemeralofftoon();
 }
 inline void WebMessageInfo::clear_ephemeralofftoon() {
-  ephemeralofftoon_ = false;
-  _has_bits_[0] &= ~0x00080000u;
+  _impl_.ephemeralofftoon_ = false;
+  _impl_._has_bits_[0] &= ~0x00080000u;
 }
 inline bool WebMessageInfo::_internal_ephemeralofftoon() const {
-  return ephemeralofftoon_;
+  return _impl_.ephemeralofftoon_;
 }
 inline bool WebMessageInfo::ephemeralofftoon() const {
   // @@protoc_insertion_point(field_get:proto.WebMessageInfo.ephemeralOffToOn)
   return _internal_ephemeralofftoon();
 }
 inline void WebMessageInfo::_internal_set_ephemeralofftoon(bool value) {
-  _has_bits_[0] |= 0x00080000u;
-  ephemeralofftoon_ = value;
+  _impl_._has_bits_[0] |= 0x00080000u;
+  _impl_.ephemeralofftoon_ = value;
 }
 inline void WebMessageInfo::set_ephemeralofftoon(bool value) {
   _internal_set_ephemeralofftoon(value);
@@ -50881,26 +53082,26 @@ inline void WebMessageInfo::set_ephemeralofftoon(bool value) {
 
 // optional bool ephemeralOutOfSync = 35;
 inline bool WebMessageInfo::_internal_has_ephemeraloutofsync() const {
-  bool value = (_has_bits_[0] & 0x00800000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00800000u) != 0;
   return value;
 }
 inline bool WebMessageInfo::has_ephemeraloutofsync() const {
   return _internal_has_ephemeraloutofsync();
 }
 inline void WebMessageInfo::clear_ephemeraloutofsync() {
-  ephemeraloutofsync_ = false;
-  _has_bits_[0] &= ~0x00800000u;
+  _impl_.ephemeraloutofsync_ = false;
+  _impl_._has_bits_[0] &= ~0x00800000u;
 }
 inline bool WebMessageInfo::_internal_ephemeraloutofsync() const {
-  return ephemeraloutofsync_;
+  return _impl_.ephemeraloutofsync_;
 }
 inline bool WebMessageInfo::ephemeraloutofsync() const {
   // @@protoc_insertion_point(field_get:proto.WebMessageInfo.ephemeralOutOfSync)
   return _internal_ephemeraloutofsync();
 }
 inline void WebMessageInfo::_internal_set_ephemeraloutofsync(bool value) {
-  _has_bits_[0] |= 0x00800000u;
-  ephemeraloutofsync_ = value;
+  _impl_._has_bits_[0] |= 0x00800000u;
+  _impl_.ephemeraloutofsync_ = value;
 }
 inline void WebMessageInfo::set_ephemeraloutofsync(bool value) {
   _internal_set_ephemeraloutofsync(value);
@@ -50909,18 +53110,18 @@ inline void WebMessageInfo::set_ephemeraloutofsync(bool value) {
 
 // optional .proto.WebMessageInfo.WebMessageInfoBizPrivacyStatus bizPrivacyStatus = 36;
 inline bool WebMessageInfo::_internal_has_bizprivacystatus() const {
-  bool value = (_has_bits_[0] & 0x01000000u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x01000000u) != 0;
   return value;
 }
 inline bool WebMessageInfo::has_bizprivacystatus() const {
   return _internal_has_bizprivacystatus();
 }
 inline void WebMessageInfo::clear_bizprivacystatus() {
-  bizprivacystatus_ = 0;
-  _has_bits_[0] &= ~0x01000000u;
+  _impl_.bizprivacystatus_ = 0;
+  _impl_._has_bits_[0] &= ~0x01000000u;
 }
 inline ::proto::WebMessageInfo_WebMessageInfoBizPrivacyStatus WebMessageInfo::_internal_bizprivacystatus() const {
-  return static_cast< ::proto::WebMessageInfo_WebMessageInfoBizPrivacyStatus >(bizprivacystatus_);
+  return static_cast< ::proto::WebMessageInfo_WebMessageInfoBizPrivacyStatus >(_impl_.bizprivacystatus_);
 }
 inline ::proto::WebMessageInfo_WebMessageInfoBizPrivacyStatus WebMessageInfo::bizprivacystatus() const {
   // @@protoc_insertion_point(field_get:proto.WebMessageInfo.bizPrivacyStatus)
@@ -50928,8 +53129,8 @@ inline ::proto::WebMessageInfo_WebMessageInfoBizPrivacyStatus WebMessageInfo::bi
 }
 inline void WebMessageInfo::_internal_set_bizprivacystatus(::proto::WebMessageInfo_WebMessageInfoBizPrivacyStatus value) {
   assert(::proto::WebMessageInfo_WebMessageInfoBizPrivacyStatus_IsValid(value));
-  _has_bits_[0] |= 0x01000000u;
-  bizprivacystatus_ = value;
+  _impl_._has_bits_[0] |= 0x01000000u;
+  _impl_.bizprivacystatus_ = value;
 }
 inline void WebMessageInfo::set_bizprivacystatus(::proto::WebMessageInfo_WebMessageInfoBizPrivacyStatus value) {
   _internal_set_bizprivacystatus(value);
@@ -50938,15 +53139,15 @@ inline void WebMessageInfo::set_bizprivacystatus(::proto::WebMessageInfo_WebMess
 
 // optional string verifiedBizName = 37;
 inline bool WebMessageInfo::_internal_has_verifiedbizname() const {
-  bool value = (_has_bits_[0] & 0x00000008u) != 0;
+  bool value = (_impl_._has_bits_[0] & 0x00000008u) != 0;
   return value;
 }
 inline bool WebMessageInfo::has_verifiedbizname() const {
   return _internal_has_verifiedbizname();
 }
 inline void WebMessageInfo::clear_verifiedbizname() {
-  verifiedbizname_.ClearToEmpty();
-  _has_bits_[0] &= ~0x00000008u;
+  _impl_.verifiedbizname_.ClearToEmpty();
+  _impl_._has_bits_[0] &= ~0x00000008u;
 }
 inline const std::string& WebMessageInfo::verifiedbizname() const {
   // @@protoc_insertion_point(field_get:proto.WebMessageInfo.verifiedBizName)
@@ -50955,8 +53156,8 @@ inline const std::string& WebMessageInfo::verifiedbizname() const {
 template <typename ArgT0, typename... ArgT>
 inline PROTOBUF_ALWAYS_INLINE
 void WebMessageInfo::set_verifiedbizname(ArgT0&& arg0, ArgT... args) {
- _has_bits_[0] |= 0x00000008u;
- verifiedbizname_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
+ _impl_._has_bits_[0] |= 0x00000008u;
+ _impl_.verifiedbizname_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
   // @@protoc_insertion_point(field_set:proto.WebMessageInfo.verifiedBizName)
 }
 inline std::string* WebMessageInfo::mutable_verifiedbizname() {
@@ -50965,32 +53166,42 @@ inline std::string* WebMessageInfo::mutable_verifiedbizname() {
   return _s;
 }
 inline const std::string& WebMessageInfo::_internal_verifiedbizname() const {
-  return verifiedbizname_.Get();
+  return _impl_.verifiedbizname_.Get();
 }
 inline void WebMessageInfo::_internal_set_verifiedbizname(const std::string& value) {
-  _has_bits_[0] |= 0x00000008u;
-  verifiedbizname_.Set(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, value, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  _impl_.verifiedbizname_.Set(value, GetArenaForAllocation());
 }
 inline std::string* WebMessageInfo::_internal_mutable_verifiedbizname() {
-  _has_bits_[0] |= 0x00000008u;
-  return verifiedbizname_.Mutable(::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::EmptyDefault{}, GetArenaForAllocation());
+  _impl_._has_bits_[0] |= 0x00000008u;
+  return _impl_.verifiedbizname_.Mutable(GetArenaForAllocation());
 }
 inline std::string* WebMessageInfo::release_verifiedbizname() {
   // @@protoc_insertion_point(field_release:proto.WebMessageInfo.verifiedBizName)
   if (!_internal_has_verifiedbizname()) {
     return nullptr;
   }
-  _has_bits_[0] &= ~0x00000008u;
-  return verifiedbizname_.ReleaseNonDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArenaForAllocation());
+  _impl_._has_bits_[0] &= ~0x00000008u;
+  auto* p = _impl_.verifiedbizname_.Release();
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.verifiedbizname_.IsDefault()) {
+    _impl_.verifiedbizname_.Set("", GetArenaForAllocation());
+  }
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  return p;
 }
 inline void WebMessageInfo::set_allocated_verifiedbizname(std::string* verifiedbizname) {
   if (verifiedbizname != nullptr) {
-    _has_bits_[0] |= 0x00000008u;
+    _impl_._has_bits_[0] |= 0x00000008u;
   } else {
-    _has_bits_[0] &= ~0x00000008u;
+    _impl_._has_bits_[0] &= ~0x00000008u;
+  }
+  _impl_.verifiedbizname_.SetAllocated(verifiedbizname, GetArenaForAllocation());
+#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
+  if (_impl_.verifiedbizname_.IsDefault()) {
+    _impl_.verifiedbizname_.Set("", GetArenaForAllocation());
   }
-  verifiedbizname_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), verifiedbizname,
-      GetArenaForAllocation());
+#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
   // @@protoc_insertion_point(field_set_allocated:proto.WebMessageInfo.verifiedBizName)
 }