Core/Proto: Re-generate protobuf services optimized for CODE_SIZE (compile time) instead of SPEED

8 files changed, 39 insertions, 2534 deletions

diff --git a/src/server/proto/Client/api/client/v1/channel_id.pb.cc b/src/server/proto/Client/api/client/v1/channel_id.pb.cc
index 02f93dd7c97..b8f0c3c24b9 100644
--- a/src/server/proto/Client/api/client/v1/channel_id.pb.cc
+++ b/src/server/proto/Client/api/client/v1/channel_id.pb.cc
@@ -4,7 +4,6 @@
 #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
 #include "api/client/v1/channel_id.pb.h"
 
-#include <algorithm>
 #include <utility>
 
 #include <google/protobuf/stubs/common.h>
@@ -15,7 +14,6 @@
 #include <google/protobuf/generated_message_reflection.h>
 #include <google/protobuf/reflection_ops.h>
 #include <google/protobuf/wire_format.h>
-#include "Log.h"
 // @@protoc_insertion_point(includes)
 
 namespace bgs {
@@ -89,7 +87,7 @@ void protobuf_AddDesc_api_2fclient_2fv1_2fchannel_5fid_2eproto() {
     "otocol.channel.v1\032\017rpc_types.proto\"T\n\tCh"
     "annelId\022\014\n\004type\030\001 \001(\r\022%\n\004host\030\002 \001(\0132\027.bg"
     "s.protocol.ProcessId\022\n\n\002id\030\003 \001(\007:\006\202\371+\002\010\001"
-    "B\002H\001", 164);
+    "B\002H\002", 164);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "api/client/v1/channel_id.proto", &protobuf_RegisterTypes);
   ChannelId::default_instance_ = new ChannelId();
@@ -168,250 +166,9 @@ ChannelId* ChannelId::New() const {
   return new ChannelId;
 }
 
-void ChannelId::Clear() {
-#define OFFSET_OF_FIELD_(f) (reinterpret_cast<char*>(      \
-  &reinterpret_cast<ChannelId*>(16)->f) - \
-   reinterpret_cast<char*>(16))
-
-#define ZR_(first, last) do {                              \
-    size_t f = OFFSET_OF_FIELD_(first);                    \
-    size_t n = OFFSET_OF_FIELD_(last) - f + sizeof(last);  \
-    ::memset(&first, 0, n);                                \
-  } while (0)
-
-  if (_has_bits_[0 / 32] & 7) {
-    ZR_(type_, id_);
-    if (has_host()) {
-      if (host_ != NULL) host_->::bgs::protocol::ProcessId::Clear();
-    }
-  }
-
-#undef OFFSET_OF_FIELD_
-#undef ZR_
-
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool ChannelId::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:bgs.protocol.channel.v1.ChannelId)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional uint32 type = 1;
-      case 1: {
-        if (tag == 8) {
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_UINT32>(
-                 input, &type_)));
-          set_has_type();
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(18)) goto parse_host;
-        break;
-      }
-
-      // optional .bgs.protocol.ProcessId host = 2;
-      case 2: {
-        if (tag == 18) {
-         parse_host:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_host()));
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(29)) goto parse_id;
-        break;
-      }
-
-      // optional fixed32 id = 3;
-      case 3: {
-        if (tag == 29) {
-         parse_id:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint32, ::google::protobuf::internal::WireFormatLite::TYPE_FIXED32>(
-                 input, &id_)));
-          set_has_id();
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectAtEnd()) goto success;
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0 ||
-            ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:bgs.protocol.channel.v1.ChannelId)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:bgs.protocol.channel.v1.ChannelId)
-  return false;
-#undef DO_
-}
-
-void ChannelId::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:bgs.protocol.channel.v1.ChannelId)
-  // optional uint32 type = 1;
-  if (has_type()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt32(1, this->type(), output);
-  }
-
-  // optional .bgs.protocol.ProcessId host = 2;
-  if (has_host()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->host(), output);
-  }
-
-  // optional fixed32 id = 3;
-  if (has_id()) {
-    ::google::protobuf::internal::WireFormatLite::WriteFixed32(3, this->id(), output);
-  }
-
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-  // @@protoc_insertion_point(serialize_end:bgs.protocol.channel.v1.ChannelId)
-}
-
-::google::protobuf::uint8* ChannelId::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.channel.v1.ChannelId)
-  // optional uint32 type = 1;
-  if (has_type()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt32ToArray(1, this->type(), target);
-  }
-
-  // optional .bgs.protocol.ProcessId host = 2;
-  if (has_host()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->host(), target);
-  }
-
-  // optional fixed32 id = 3;
-  if (has_id()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteFixed32ToArray(3, this->id(), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.channel.v1.ChannelId)
-  return target;
-}
-
-int ChannelId::ByteSize() const {
-  int total_size = 0;
-
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional uint32 type = 1;
-    if (has_type()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt32Size(
-          this->type());
-    }
-
-    // optional .bgs.protocol.ProcessId host = 2;
-    if (has_host()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->host());
-    }
-
-    // optional fixed32 id = 3;
-    if (has_id()) {
-      total_size += 1 + 4;
-    }
-
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void ChannelId::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const ChannelId* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const ChannelId*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void ChannelId::MergeFrom(const ChannelId& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_type()) {
-      set_type(from.type());
-    }
-    if (from.has_host()) {
-      mutable_host()->::bgs::protocol::ProcessId::MergeFrom(from.host());
-    }
-    if (from.has_id()) {
-      set_id(from.id());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void ChannelId::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void ChannelId::CopyFrom(const ChannelId& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool ChannelId::IsInitialized() const {
-  if (has_host()) {
-    if (!this->host().IsInitialized()) return false;
-  }
-  return true;
-}
-
 void ChannelId::Swap(ChannelId* other) {
   if (other != this) {
-    std::swap(type_, other->type_);
-    std::swap(host_, other->host_);
-    std::swap(id_, other->id_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
+    GetReflection()->Swap(this, other);}
 }
 
 ::google::protobuf::Metadata ChannelId::GetMetadata() const {
diff --git a/src/server/proto/Client/api/client/v1/channel_id.pb.h b/src/server/proto/Client/api/client/v1/channel_id.pb.h
index 9378c7d1b62..0628bd757fb 100644
--- a/src/server/proto/Client/api/client/v1/channel_id.pb.h
+++ b/src/server/proto/Client/api/client/v1/channel_id.pb.h
@@ -70,19 +70,6 @@ class TC_PROTO_API ChannelId : public ::google::protobuf::Message {
   // implements Message ----------------------------------------------
 
   ChannelId* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const ChannelId& from);
-  void MergeFrom(const ChannelId& from);
-  void Clear();
-  bool IsInitialized() const;
-
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
diff --git a/src/server/proto/Client/api/client/v2/attribute_types.pb.cc b/src/server/proto/Client/api/client/v2/attribute_types.pb.cc
index c0de44b22ad..b0c4fc4e402 100644
--- a/src/server/proto/Client/api/client/v2/attribute_types.pb.cc
+++ b/src/server/proto/Client/api/client/v2/attribute_types.pb.cc
@@ -4,7 +4,6 @@
 #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
 #include "api/client/v2/attribute_types.pb.h"
 
-#include <algorithm>
 #include <utility>
 
 #include <google/protobuf/stubs/common.h>
@@ -15,7 +14,6 @@
 #include <google/protobuf/generated_message_reflection.h>
 #include <google/protobuf/reflection_ops.h>
 #include <google/protobuf/wire_format.h>
-#include "Log.h"
 // @@protoc_insertion_point(includes)
 
 namespace bgs {
@@ -158,7 +156,7 @@ void protobuf_AddDesc_api_2fclient_2fv2_2fattribute_5ftypes_2eproto() {
     "ibute\030\002 \003(\0132\032.bgs.protocol.v2.Attribute\""
     "V\n\tOperation\022\016\n\nMATCH_NONE\020\000\022\r\n\tMATCH_AN"
     "Y\020\001\022\r\n\tMATCH_ALL\020\002\022\033\n\027MATCH_ALL_MOST_SPE"
-    "CIFIC\020\003B\002H\001", 491);
+    "CIFIC\020\003B\002H\002", 491);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "api/client/v2/attribute_types.proto", &protobuf_RegisterTypes);
   Variant::default_instance_ = new Variant();
@@ -284,359 +282,9 @@ void Variant::clear_type() {
   _oneof_case_[0] = TYPE_NOT_SET;
 }
 
-void Variant::Clear() {
-  clear_type();
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool Variant::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:bgs.protocol.v2.Variant)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional bool bool_value = 1;
-      case 1: {
-        if (tag == 8) {
-          clear_type();
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
-                 input, &type_.bool_value_)));
-          set_has_bool_value();
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(16)) goto parse_int_value;
-        break;
-      }
-
-      // optional int64 int_value = 2;
-      case 2: {
-        if (tag == 16) {
-         parse_int_value:
-          clear_type();
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::int64, ::google::protobuf::internal::WireFormatLite::TYPE_INT64>(
-                 input, &type_.int_value_)));
-          set_has_int_value();
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(25)) goto parse_float_value;
-        break;
-      }
-
-      // optional double float_value = 3;
-      case 3: {
-        if (tag == 25) {
-         parse_float_value:
-          clear_type();
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   double, ::google::protobuf::internal::WireFormatLite::TYPE_DOUBLE>(
-                 input, &type_.float_value_)));
-          set_has_float_value();
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(34)) goto parse_string_value;
-        break;
-      }
-
-      // optional string string_value = 4;
-      case 4: {
-        if (tag == 34) {
-         parse_string_value:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_string_value()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-            this->string_value().data(), this->string_value().length(),
-            ::google::protobuf::internal::WireFormat::PARSE,
-            "string_value");
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(42)) goto parse_blob_value;
-        break;
-      }
-
-      // optional bytes blob_value = 5;
-      case 5: {
-        if (tag == 42) {
-         parse_blob_value:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadBytes(
-                input, this->mutable_blob_value()));
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(48)) goto parse_uint_value;
-        break;
-      }
-
-      // optional uint64 uint_value = 6;
-      case 6: {
-        if (tag == 48) {
-         parse_uint_value:
-          clear_type();
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
-                 input, &type_.uint_value_)));
-          set_has_uint_value();
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectAtEnd()) goto success;
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0 ||
-            ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:bgs.protocol.v2.Variant)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:bgs.protocol.v2.Variant)
-  return false;
-#undef DO_
-}
-
-void Variant::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:bgs.protocol.v2.Variant)
-  // optional bool bool_value = 1;
-  if (has_bool_value()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBool(1, this->bool_value(), output);
-  }
-
-  // optional int64 int_value = 2;
-  if (has_int_value()) {
-    ::google::protobuf::internal::WireFormatLite::WriteInt64(2, this->int_value(), output);
-  }
-
-  // optional double float_value = 3;
-  if (has_float_value()) {
-    ::google::protobuf::internal::WireFormatLite::WriteDouble(3, this->float_value(), output);
-  }
-
-  // optional string string_value = 4;
-  if (has_string_value()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->string_value().data(), this->string_value().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "string_value");
-    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
-      4, this->string_value(), output);
-  }
-
-  // optional bytes blob_value = 5;
-  if (has_blob_value()) {
-    ::google::protobuf::internal::WireFormatLite::WriteBytesMaybeAliased(
-      5, this->blob_value(), output);
-  }
-
-  // optional uint64 uint_value = 6;
-  if (has_uint_value()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt64(6, this->uint_value(), output);
-  }
-
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-  // @@protoc_insertion_point(serialize_end:bgs.protocol.v2.Variant)
-}
-
-::google::protobuf::uint8* Variant::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.v2.Variant)
-  // optional bool bool_value = 1;
-  if (has_bool_value()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteBoolToArray(1, this->bool_value(), target);
-  }
-
-  // optional int64 int_value = 2;
-  if (has_int_value()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteInt64ToArray(2, this->int_value(), target);
-  }
-
-  // optional double float_value = 3;
-  if (has_float_value()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteDoubleToArray(3, this->float_value(), target);
-  }
-
-  // optional string string_value = 4;
-  if (has_string_value()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->string_value().data(), this->string_value().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "string_value");
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        4, this->string_value(), target);
-  }
-
-  // optional bytes blob_value = 5;
-  if (has_blob_value()) {
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteBytesToArray(
-        5, this->blob_value(), target);
-  }
-
-  // optional uint64 uint_value = 6;
-  if (has_uint_value()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(6, this->uint_value(), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.v2.Variant)
-  return target;
-}
-
-int Variant::ByteSize() const {
-  int total_size = 0;
-
-  switch (type_case()) {
-    // optional bool bool_value = 1;
-    case kBoolValue: {
-      total_size += 1 + 1;
-      break;
-    }
-    // optional int64 int_value = 2;
-    case kIntValue: {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::Int64Size(
-          this->int_value());
-      break;
-    }
-    // optional double float_value = 3;
-    case kFloatValue: {
-      total_size += 1 + 8;
-      break;
-    }
-    // optional string string_value = 4;
-    case kStringValue: {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->string_value());
-      break;
-    }
-    // optional bytes blob_value = 5;
-    case kBlobValue: {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::BytesSize(
-          this->blob_value());
-      break;
-    }
-    // optional uint64 uint_value = 6;
-    case kUintValue: {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt64Size(
-          this->uint_value());
-      break;
-    }
-    case TYPE_NOT_SET: {
-      break;
-    }
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void Variant::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const Variant* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const Variant*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void Variant::MergeFrom(const Variant& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  switch (from.type_case()) {
-    case kBoolValue: {
-      set_bool_value(from.bool_value());
-      break;
-    }
-    case kIntValue: {
-      set_int_value(from.int_value());
-      break;
-    }
-    case kFloatValue: {
-      set_float_value(from.float_value());
-      break;
-    }
-    case kStringValue: {
-      set_string_value(from.string_value());
-      break;
-    }
-    case kBlobValue: {
-      set_blob_value(from.blob_value());
-      break;
-    }
-    case kUintValue: {
-      set_uint_value(from.uint_value());
-      break;
-    }
-    case TYPE_NOT_SET: {
-      break;
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void Variant::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void Variant::CopyFrom(const Variant& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Variant::IsInitialized() const {
-  return true;
-}
-
 void Variant::Swap(Variant* other) {
   if (other != this) {
-    std::swap(type_, other->type_);
-    std::swap(_oneof_case_[0], other->_oneof_case_[0]);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
+    GetReflection()->Swap(this, other);}
 }
 
 ::google::protobuf::Metadata Variant::GetMetadata() const {
@@ -714,216 +362,9 @@ Attribute* Attribute::New() const {
   return new Attribute;
 }
 
-void Attribute::Clear() {
-  if (_has_bits_[0 / 32] & 3) {
-    if (has_name()) {
-      if (name_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-        name_->clear();
-      }
-    }
-    if (has_value()) {
-      if (value_ != NULL) value_->::bgs::protocol::v2::Variant::Clear();
-    }
-  }
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool Attribute::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:bgs.protocol.v2.Attribute)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional string name = 1;
-      case 1: {
-        if (tag == 10) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_name()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-            this->name().data(), this->name().length(),
-            ::google::protobuf::internal::WireFormat::PARSE,
-            "name");
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(18)) goto parse_value;
-        break;
-      }
-
-      // optional .bgs.protocol.v2.Variant value = 2;
-      case 2: {
-        if (tag == 18) {
-         parse_value:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_value()));
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectAtEnd()) goto success;
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0 ||
-            ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:bgs.protocol.v2.Attribute)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:bgs.protocol.v2.Attribute)
-  return false;
-#undef DO_
-}
-
-void Attribute::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:bgs.protocol.v2.Attribute)
-  // optional string name = 1;
-  if (has_name()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->name().data(), this->name().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "name");
-    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
-      1, this->name(), output);
-  }
-
-  // optional .bgs.protocol.v2.Variant value = 2;
-  if (has_value()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->value(), output);
-  }
-
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-  // @@protoc_insertion_point(serialize_end:bgs.protocol.v2.Attribute)
-}
-
-::google::protobuf::uint8* Attribute::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.v2.Attribute)
-  // optional string name = 1;
-  if (has_name()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->name().data(), this->name().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "name");
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        1, this->name(), target);
-  }
-
-  // optional .bgs.protocol.v2.Variant value = 2;
-  if (has_value()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->value(), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.v2.Attribute)
-  return target;
-}
-
-int Attribute::ByteSize() const {
-  int total_size = 0;
-
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional string name = 1;
-    if (has_name()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->name());
-    }
-
-    // optional .bgs.protocol.v2.Variant value = 2;
-    if (has_value()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->value());
-    }
-
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void Attribute::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const Attribute* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const Attribute*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void Attribute::MergeFrom(const Attribute& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_name()) {
-      set_name(from.name());
-    }
-    if (from.has_value()) {
-      mutable_value()->::bgs::protocol::v2::Variant::MergeFrom(from.value());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void Attribute::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void Attribute::CopyFrom(const Attribute& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Attribute::IsInitialized() const {
-  return true;
-}
-
 void Attribute::Swap(Attribute* other) {
   if (other != this) {
-    std::swap(name_, other->name_);
-    std::swap(value_, other->value_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
+    GetReflection()->Swap(this, other);}
 }
 
 ::google::protobuf::Metadata Attribute::GetMetadata() const {
@@ -1019,201 +460,9 @@ AttributeFilter* AttributeFilter::New() const {
   return new AttributeFilter;
 }
 
-void AttributeFilter::Clear() {
-  op_ = 0;
-  attribute_.Clear();
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool AttributeFilter::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:bgs.protocol.v2.AttributeFilter)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional .bgs.protocol.v2.AttributeFilter.Operation op = 1;
-      case 1: {
-        if (tag == 8) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (::bgs::protocol::v2::AttributeFilter_Operation_IsValid(value)) {
-            set_op(static_cast< ::bgs::protocol::v2::AttributeFilter_Operation >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(1, value);
-          }
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(18)) goto parse_attribute;
-        break;
-      }
-
-      // repeated .bgs.protocol.v2.Attribute attribute = 2;
-      case 2: {
-        if (tag == 18) {
-         parse_attribute:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_attribute()));
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(18)) goto parse_attribute;
-        if (input->ExpectAtEnd()) goto success;
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0 ||
-            ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:bgs.protocol.v2.AttributeFilter)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:bgs.protocol.v2.AttributeFilter)
-  return false;
-#undef DO_
-}
-
-void AttributeFilter::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:bgs.protocol.v2.AttributeFilter)
-  // optional .bgs.protocol.v2.AttributeFilter.Operation op = 1;
-  if (has_op()) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      1, this->op(), output);
-  }
-
-  // repeated .bgs.protocol.v2.Attribute attribute = 2;
-  for (int i = 0; i < this->attribute_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->attribute(i), output);
-  }
-
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-  // @@protoc_insertion_point(serialize_end:bgs.protocol.v2.AttributeFilter)
-}
-
-::google::protobuf::uint8* AttributeFilter::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.v2.AttributeFilter)
-  // optional .bgs.protocol.v2.AttributeFilter.Operation op = 1;
-  if (has_op()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      1, this->op(), target);
-  }
-
-  // repeated .bgs.protocol.v2.Attribute attribute = 2;
-  for (int i = 0; i < this->attribute_size(); i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        2, this->attribute(i), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.v2.AttributeFilter)
-  return target;
-}
-
-int AttributeFilter::ByteSize() const {
-  int total_size = 0;
-
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional .bgs.protocol.v2.AttributeFilter.Operation op = 1;
-    if (has_op()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->op());
-    }
-
-  }
-  // repeated .bgs.protocol.v2.Attribute attribute = 2;
-  total_size += 1 * this->attribute_size();
-  for (int i = 0; i < this->attribute_size(); i++) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        this->attribute(i));
-  }
-
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void AttributeFilter::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const AttributeFilter* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const AttributeFilter*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void AttributeFilter::MergeFrom(const AttributeFilter& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  attribute_.MergeFrom(from.attribute_);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_op()) {
-      set_op(from.op());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void AttributeFilter::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void AttributeFilter::CopyFrom(const AttributeFilter& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool AttributeFilter::IsInitialized() const {
-  return true;
-}
-
 void AttributeFilter::Swap(AttributeFilter* other) {
   if (other != this) {
-    std::swap(op_, other->op_);
-    attribute_.Swap(&other->attribute_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
+    GetReflection()->Swap(this, other);}
 }
 
 ::google::protobuf::Metadata AttributeFilter::GetMetadata() const {
diff --git a/src/server/proto/Client/api/client/v2/attribute_types.pb.h b/src/server/proto/Client/api/client/v2/attribute_types.pb.h
index 53d5f30ac0f..80e1bdb5f0c 100644
--- a/src/server/proto/Client/api/client/v2/attribute_types.pb.h
+++ b/src/server/proto/Client/api/client/v2/attribute_types.pb.h
@@ -102,19 +102,6 @@ class TC_PROTO_API Variant : public ::google::protobuf::Message {
   // implements Message ----------------------------------------------
 
   Variant* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const Variant& from);
-  void MergeFrom(const Variant& from);
-  void Clear();
-  bool IsInitialized() const;
-
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
@@ -244,19 +231,6 @@ class TC_PROTO_API Attribute : public ::google::protobuf::Message {
   // implements Message ----------------------------------------------
 
   Attribute* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const Attribute& from);
-  void MergeFrom(const Attribute& from);
-  void Clear();
-  bool IsInitialized() const;
-
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
@@ -340,19 +314,6 @@ class TC_PROTO_API AttributeFilter : public ::google::protobuf::Message {
   // implements Message ----------------------------------------------
 
   AttributeFilter* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const AttributeFilter& from);
-  void MergeFrom(const AttributeFilter& from);
-  void Clear();
-  bool IsInitialized() const;
-
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
diff --git a/src/server/proto/Client/api/client/v2/report_service.pb.cc b/src/server/proto/Client/api/client/v2/report_service.pb.cc
index 0cb8338ce8f..ff7797245dd 100644
--- a/src/server/proto/Client/api/client/v2/report_service.pb.cc
+++ b/src/server/proto/Client/api/client/v2/report_service.pb.cc
@@ -4,7 +4,6 @@
 #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
 #include "api/client/v2/report_service.pb.h"
 
-#include <algorithm>
 #include <utility>
 
 #include <google/protobuf/stubs/common.h>
@@ -15,8 +14,6 @@
 #include <google/protobuf/generated_message_reflection.h>
 #include <google/protobuf/reflection_ops.h>
 #include <google/protobuf/wire_format.h>
-#include "Log.h"
-#include "Errors.h"
 #include "BattlenetRpcErrorCodes.h"
 // @@protoc_insertion_point(includes)
 
@@ -117,7 +114,7 @@ void protobuf_AddDesc_api_2fclient_2fv2_2freport_5fservice_2eproto() {
     ".report.v2.SubmitReportRequest\032\024.bgs.pro"
     "tocol.NoData\"\006\202\371+\002\010\001\0329\202\371+/\n%bnet.protoco"
     "l.report.v2.ReportService*\006report\212\371+\002\020\001B"
-    "\005H\001\200\001\000", 606);
+    "\005H\002\200\001\000", 606);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "api/client/v2/report_service.proto", &protobuf_RegisterTypes);
   SubmitReportRequest::default_instance_ = new SubmitReportRequest();
@@ -230,346 +227,9 @@ void SubmitReportRequest::clear_type() {
   _oneof_case_[0] = TYPE_NOT_SET;
 }
 
-void SubmitReportRequest::Clear() {
-  if (_has_bits_[0 / 32] & 3) {
-    if (has_agent_id()) {
-      if (agent_id_ != NULL) agent_id_->::bgs::protocol::account::v1::AccountId::Clear();
-    }
-    if (has_user_description()) {
-      if (user_description_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-        user_description_->clear();
-      }
-    }
-  }
-  clear_type();
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool SubmitReportRequest::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:bgs.protocol.report.v2.SubmitReportRequest)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(16383);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional .bgs.protocol.account.v1.AccountId agent_id = 1;
-      case 1: {
-        if (tag == 10) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_agent_id()));
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(18)) goto parse_user_description;
-        break;
-      }
-
-      // optional string user_description = 2;
-      case 2: {
-        if (tag == 18) {
-         parse_user_description:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_user_description()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-            this->user_description().data(), this->user_description().length(),
-            ::google::protobuf::internal::WireFormat::PARSE,
-            "user_description");
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(82)) goto parse_user_options;
-        break;
-      }
-
-      // optional .bgs.protocol.report.v2.UserOptions user_options = 10;
-      case 10: {
-        if (tag == 82) {
-         parse_user_options:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_user_options()));
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(90)) goto parse_club_options;
-        break;
-      }
-
-      // optional .bgs.protocol.report.v2.ClubOptions club_options = 11;
-      case 11: {
-        if (tag == 90) {
-         parse_club_options:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_club_options()));
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(162)) goto parse_entity_options;
-        break;
-      }
-
-      // optional .bgs.protocol.report.v2.EntityOptions entity_options = 20;
-      case 20: {
-        if (tag == 162) {
-         parse_entity_options:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_entity_options()));
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectAtEnd()) goto success;
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0 ||
-            ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:bgs.protocol.report.v2.SubmitReportRequest)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:bgs.protocol.report.v2.SubmitReportRequest)
-  return false;
-#undef DO_
-}
-
-void SubmitReportRequest::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:bgs.protocol.report.v2.SubmitReportRequest)
-  // optional .bgs.protocol.account.v1.AccountId agent_id = 1;
-  if (has_agent_id()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->agent_id(), output);
-  }
-
-  // optional string user_description = 2;
-  if (has_user_description()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->user_description().data(), this->user_description().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "user_description");
-    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
-      2, this->user_description(), output);
-  }
-
-  // optional .bgs.protocol.report.v2.UserOptions user_options = 10;
-  if (has_user_options()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      10, this->user_options(), output);
-  }
-
-  // optional .bgs.protocol.report.v2.ClubOptions club_options = 11;
-  if (has_club_options()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      11, this->club_options(), output);
-  }
-
-  // optional .bgs.protocol.report.v2.EntityOptions entity_options = 20;
-  if (has_entity_options()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      20, this->entity_options(), output);
-  }
-
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-  // @@protoc_insertion_point(serialize_end:bgs.protocol.report.v2.SubmitReportRequest)
-}
-
-::google::protobuf::uint8* SubmitReportRequest::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.report.v2.SubmitReportRequest)
-  // optional .bgs.protocol.account.v1.AccountId agent_id = 1;
-  if (has_agent_id()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->agent_id(), target);
-  }
-
-  // optional string user_description = 2;
-  if (has_user_description()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->user_description().data(), this->user_description().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "user_description");
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        2, this->user_description(), target);
-  }
-
-  // optional .bgs.protocol.report.v2.UserOptions user_options = 10;
-  if (has_user_options()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        10, this->user_options(), target);
-  }
-
-  // optional .bgs.protocol.report.v2.ClubOptions club_options = 11;
-  if (has_club_options()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        11, this->club_options(), target);
-  }
-
-  // optional .bgs.protocol.report.v2.EntityOptions entity_options = 20;
-  if (has_entity_options()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        20, this->entity_options(), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.report.v2.SubmitReportRequest)
-  return target;
-}
-
-int SubmitReportRequest::ByteSize() const {
-  int total_size = 0;
-
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional .bgs.protocol.account.v1.AccountId agent_id = 1;
-    if (has_agent_id()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->agent_id());
-    }
-
-    // optional string user_description = 2;
-    if (has_user_description()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->user_description());
-    }
-
-  }
-  switch (type_case()) {
-    // optional .bgs.protocol.report.v2.UserOptions user_options = 10;
-    case kUserOptions: {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->user_options());
-      break;
-    }
-    // optional .bgs.protocol.report.v2.ClubOptions club_options = 11;
-    case kClubOptions: {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->club_options());
-      break;
-    }
-    // optional .bgs.protocol.report.v2.EntityOptions entity_options = 20;
-    case kEntityOptions: {
-      total_size += 2 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->entity_options());
-      break;
-    }
-    case TYPE_NOT_SET: {
-      break;
-    }
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void SubmitReportRequest::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const SubmitReportRequest* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const SubmitReportRequest*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void SubmitReportRequest::MergeFrom(const SubmitReportRequest& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  switch (from.type_case()) {
-    case kUserOptions: {
-      mutable_user_options()->::bgs::protocol::report::v2::UserOptions::MergeFrom(from.user_options());
-      break;
-    }
-    case kClubOptions: {
-      mutable_club_options()->::bgs::protocol::report::v2::ClubOptions::MergeFrom(from.club_options());
-      break;
-    }
-    case kEntityOptions: {
-      mutable_entity_options()->::bgs::protocol::report::v2::EntityOptions::MergeFrom(from.entity_options());
-      break;
-    }
-    case TYPE_NOT_SET: {
-      break;
-    }
-  }
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_agent_id()) {
-      mutable_agent_id()->::bgs::protocol::account::v1::AccountId::MergeFrom(from.agent_id());
-    }
-    if (from.has_user_description()) {
-      set_user_description(from.user_description());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void SubmitReportRequest::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void SubmitReportRequest::CopyFrom(const SubmitReportRequest& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool SubmitReportRequest::IsInitialized() const {
-  if (has_agent_id()) {
-    if (!this->agent_id().IsInitialized()) return false;
-  }
-  if (has_user_options()) {
-    if (!this->user_options().IsInitialized()) return false;
-  }
-  return true;
-}
-
 void SubmitReportRequest::Swap(SubmitReportRequest* other) {
   if (other != this) {
-    std::swap(agent_id_, other->agent_id_);
-    std::swap(user_description_, other->user_description_);
-    std::swap(type_, other->type_);
-    std::swap(_oneof_case_[0], other->_oneof_case_[0]);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
+    GetReflection()->Swap(this, other);}
 }
 
 ::google::protobuf::Metadata SubmitReportRequest::GetMetadata() const {
@@ -582,7 +242,7 @@ void SubmitReportRequest::Swap(SubmitReportRequest* other) {
 
 // ===================================================================
 
-ReportService::ReportService(bool use_original_hash) : service_hash_(use_original_hash ? OriginalHash::value : NameHash::value) {
+ReportService::ReportService(bool use_original_hash) : ServiceBase(use_original_hash ? OriginalHash::value : NameHash::value) {
 }
 
 ReportService::~ReportService() {
@@ -595,45 +255,36 @@ google::protobuf::ServiceDescriptor const* ReportService::descriptor() {
 
 void ReportService::CallServerMethod(uint32 token, uint32 methodId, MessageBuffer buffer) {
   switch(methodId & 0x3FFFFFFF) {
-    case 1: {
-      ::bgs::protocol::report::v2::SubmitReportRequest request;
-      if (!request.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) {
-        TC_LOG_DEBUG("service.protobuf", "%s Failed to parse request for ReportService.SubmitReport server method call.", GetCallerInfo().c_str());
-        SendResponse(service_hash_, methodId, token, ERROR_RPC_MALFORMED_REQUEST);
-        return;
-      }
-      TC_LOG_DEBUG("service.protobuf", "%s Client called server method ReportService.SubmitReport(bgs.protocol.report.v2.SubmitReportRequest{ %s }).",
-        GetCallerInfo().c_str(), request.ShortDebugString().c_str());
-      std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)> continuation = [token, methodId](ServiceBase* service, uint32 status, ::google::protobuf::Message const* response)
-      {
-        ASSERT(response->GetDescriptor() == ::bgs::protocol::NoData::descriptor());
-        ReportService* self = static_cast<ReportService*>(service);
-        TC_LOG_DEBUG("service.protobuf", "%s Client called server method ReportService.SubmitReport() returned bgs.protocol.NoData{ %s } status %u.",
-          self->GetCallerInfo().c_str(), response->ShortDebugString().c_str(), status);
-        if (!status)
-          self->SendResponse(self->service_hash_, methodId, token, response);
-        else
-          self->SendResponse(self->service_hash_, methodId, token, status);
-      };
-      ::bgs::protocol::NoData response;
-      uint32 status = HandleSubmitReport(&request, &response, continuation);
-      if (continuation)
-        continuation(this, status, &response);
+    case 1:
+      ParseAndHandleSubmitReport(token, methodId, buffer);
       break;
-    }
     default:
-      TC_LOG_ERROR("service.protobuf", "Bad method id %u.", methodId);
+      LogInvalidMethod(methodId);
       SendResponse(service_hash_, methodId, token, ERROR_RPC_INVALID_METHOD);
       break;
     }
 }
 
-uint32 ReportService::HandleSubmitReport(::bgs::protocol::report::v2::SubmitReportRequest const* request, ::bgs::protocol::NoData* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation) {
-  TC_LOG_ERROR("service.protobuf", "%s Client tried to call not implemented method ReportService.SubmitReport({ %s })",
-    GetCallerInfo().c_str(), request->ShortDebugString().c_str());
+uint32 ReportService::HandleSubmitReport(::bgs::protocol::report::v2::SubmitReportRequest const* request, ::bgs::protocol::NoData* /*response*/, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& /*continuation*/) {
+  LogUnimplementedServerMethod("ReportService.SubmitReport", request);
   return ERROR_RPC_NOT_IMPLEMENTED;
 }
 
+void ReportService::ParseAndHandleSubmitReport(uint32 token, uint32 methodId, MessageBuffer& buffer) {
+  ::bgs::protocol::report::v2::SubmitReportRequest request;
+  if (!request.ParseFromArray(buffer.GetReadPointer(), buffer.GetActiveSize())) {
+    LogFailedParsingRequest("ReportService.SubmitReport");
+    SendResponse(service_hash_, methodId, token, ERROR_RPC_MALFORMED_REQUEST);
+    return;
+  }
+  LogCallServerMethod("ReportService.SubmitReport", "bgs.protocol.report.v2.SubmitReportRequest", &request);
+  std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)> continuation = CreateServerContinuation(token, methodId, "ReportService.SubmitReport", ::bgs::protocol::NoData::descriptor());
+  ::bgs::protocol::NoData response;
+  uint32 status = HandleSubmitReport(&request, &response, continuation);
+  if (continuation)
+    continuation(this, status, &response);
+}
+
 // @@protoc_insertion_point(namespace_scope)
 
 }  // namespace v2
diff --git a/src/server/proto/Client/api/client/v2/report_service.pb.h b/src/server/proto/Client/api/client/v2/report_service.pb.h
index 78abf66d267..7a7368fa0f3 100644
--- a/src/server/proto/Client/api/client/v2/report_service.pb.h
+++ b/src/server/proto/Client/api/client/v2/report_service.pb.h
@@ -82,19 +82,6 @@ class TC_PROTO_API SubmitReportRequest : public ::google::protobuf::Message {
   // implements Message ----------------------------------------------
 
   SubmitReportRequest* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const SubmitReportRequest& from);
-  void MergeFrom(const SubmitReportRequest& from);
-  void Clear();
-  bool IsInitialized() const;
-
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
@@ -197,6 +184,10 @@ class TC_PROTO_API ReportService : public ServiceBase
  public:
 
   explicit ReportService(bool use_original_hash);
+  ReportService(ReportService const&) = delete;
+  ReportService(ReportService&&) = delete;
+  ReportService& operator=(ReportService const&) = delete;
+  ReportService& operator=(ReportService&&) = delete;
   virtual ~ReportService();
 
   typedef std::integral_constant<uint32, 0x3A4218FBu> OriginalHash;
@@ -211,9 +202,7 @@ class TC_PROTO_API ReportService : public ServiceBase
   virtual uint32 HandleSubmitReport(::bgs::protocol::report::v2::SubmitReportRequest const* request, ::bgs::protocol::NoData* response, std::function<void(ServiceBase*, uint32, ::google::protobuf::Message const*)>& continuation);
 
  private:
-  uint32 service_hash_;
-
-  GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(ReportService);
+  void ParseAndHandleSubmitReport(uint32 token, uint32 methodId, MessageBuffer& buffer);
 };
 
 // ===================================================================
diff --git a/src/server/proto/Client/api/client/v2/report_types.pb.cc b/src/server/proto/Client/api/client/v2/report_types.pb.cc
index 93d3b41fd85..4ced87b4f59 100644
--- a/src/server/proto/Client/api/client/v2/report_types.pb.cc
+++ b/src/server/proto/Client/api/client/v2/report_types.pb.cc
@@ -4,7 +4,6 @@
 #define INTERNAL_SUPPRESS_PROTOBUF_FIELD_DEPRECATION
 #include "api/client/v2/report_types.pb.h"
 
-#include <algorithm>
 #include <utility>
 
 #include <google/protobuf/stubs/common.h>
@@ -15,7 +14,6 @@
 #include <google/protobuf/generated_message_reflection.h>
 #include <google/protobuf/reflection_ops.h>
 #include <google/protobuf/wire_format.h>
-#include "Log.h"
 // @@protoc_insertion_point(includes)
 
 namespace bgs {
@@ -205,7 +203,7 @@ void protobuf_AddDesc_api_2fclient_2fv2_2freport_5ftypes_2eproto() {
     "\020\006*t\n\nClubSource\022\025\n\021CLUB_SOURCE_OTHER\020\000\022"
     "\027\n\023CLUB_SOURCE_MESSAGE\020\001\022\031\n\025CLUB_SOURCE_"
     "CLUB_NAME\020\002\022\033\n\027CLUB_SOURCE_STREAM_NAME\020\003"
-    "B\005H\001\200\001\000", 1247);
+    "B\005H\002\200\001\000", 1247);
   ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
     "api/client/v2/report_types.proto", &protobuf_RegisterTypes);
   ReportItem::default_instance_ = new ReportItem();
@@ -354,166 +352,9 @@ void ReportItem::clear_type() {
   _oneof_case_[0] = TYPE_NOT_SET;
 }
 
-void ReportItem::Clear() {
-  clear_type();
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool ReportItem::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:bgs.protocol.report.v2.ReportItem)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional .bgs.protocol.MessageId message_id = 1;
-      case 1: {
-        if (tag == 10) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_message_id()));
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectAtEnd()) goto success;
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0 ||
-            ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:bgs.protocol.report.v2.ReportItem)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:bgs.protocol.report.v2.ReportItem)
-  return false;
-#undef DO_
-}
-
-void ReportItem::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:bgs.protocol.report.v2.ReportItem)
-  // optional .bgs.protocol.MessageId message_id = 1;
-  if (has_message_id()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->message_id(), output);
-  }
-
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-  // @@protoc_insertion_point(serialize_end:bgs.protocol.report.v2.ReportItem)
-}
-
-::google::protobuf::uint8* ReportItem::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.report.v2.ReportItem)
-  // optional .bgs.protocol.MessageId message_id = 1;
-  if (has_message_id()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->message_id(), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.report.v2.ReportItem)
-  return target;
-}
-
-int ReportItem::ByteSize() const {
-  int total_size = 0;
-
-  switch (type_case()) {
-    // optional .bgs.protocol.MessageId message_id = 1;
-    case kMessageId: {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->message_id());
-      break;
-    }
-    case TYPE_NOT_SET: {
-      break;
-    }
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void ReportItem::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const ReportItem* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const ReportItem*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void ReportItem::MergeFrom(const ReportItem& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  switch (from.type_case()) {
-    case kMessageId: {
-      mutable_message_id()->::bgs::protocol::MessageId::MergeFrom(from.message_id());
-      break;
-    }
-    case TYPE_NOT_SET: {
-      break;
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void ReportItem::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void ReportItem::CopyFrom(const ReportItem& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool ReportItem::IsInitialized() const {
-  return true;
-}
-
 void ReportItem::Swap(ReportItem* other) {
   if (other != this) {
-    std::swap(type_, other->type_);
-    std::swap(_oneof_case_[0], other->_oneof_case_[0]);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
+    GetReflection()->Swap(this, other);}
 }
 
 ::google::protobuf::Metadata ReportItem::GetMetadata() const {
@@ -593,304 +434,9 @@ UserOptions* UserOptions::New() const {
   return new UserOptions;
 }
 
-void UserOptions::Clear() {
-#define OFFSET_OF_FIELD_(f) (reinterpret_cast<char*>(      \
-  &reinterpret_cast<UserOptions*>(16)->f) - \
-   reinterpret_cast<char*>(16))
-
-#define ZR_(first, last) do {                              \
-    size_t f = OFFSET_OF_FIELD_(first);                    \
-    size_t n = OFFSET_OF_FIELD_(last) - f + sizeof(last);  \
-    ::memset(&first, 0, n);                                \
-  } while (0)
-
-  if (_has_bits_[0 / 32] & 15) {
-    ZR_(type_, source_);
-    if (has_target_id()) {
-      if (target_id_ != NULL) target_id_->::bgs::protocol::account::v1::AccountId::Clear();
-    }
-    if (has_item()) {
-      if (item_ != NULL) item_->::bgs::protocol::report::v2::ReportItem::Clear();
-    }
-  }
-
-#undef OFFSET_OF_FIELD_
-#undef ZR_
-
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool UserOptions::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:bgs.protocol.report.v2.UserOptions)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional .bgs.protocol.account.v1.AccountId target_id = 1;
-      case 1: {
-        if (tag == 10) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_target_id()));
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(16)) goto parse_type;
-        break;
-      }
-
-      // optional .bgs.protocol.report.v2.IssueType type = 2;
-      case 2: {
-        if (tag == 16) {
-         parse_type:
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (::bgs::protocol::report::v2::IssueType_IsValid(value)) {
-            set_type(static_cast< ::bgs::protocol::report::v2::IssueType >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(2, value);
-          }
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(24)) goto parse_source;
-        break;
-      }
-
-      // optional .bgs.protocol.report.v2.UserSource source = 3;
-      case 3: {
-        if (tag == 24) {
-         parse_source:
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (::bgs::protocol::report::v2::UserSource_IsValid(value)) {
-            set_source(static_cast< ::bgs::protocol::report::v2::UserSource >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(3, value);
-          }
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(34)) goto parse_item;
-        break;
-      }
-
-      // optional .bgs.protocol.report.v2.ReportItem item = 4;
-      case 4: {
-        if (tag == 34) {
-         parse_item:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_item()));
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectAtEnd()) goto success;
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0 ||
-            ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:bgs.protocol.report.v2.UserOptions)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:bgs.protocol.report.v2.UserOptions)
-  return false;
-#undef DO_
-}
-
-void UserOptions::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:bgs.protocol.report.v2.UserOptions)
-  // optional .bgs.protocol.account.v1.AccountId target_id = 1;
-  if (has_target_id()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      1, this->target_id(), output);
-  }
-
-  // optional .bgs.protocol.report.v2.IssueType type = 2;
-  if (has_type()) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      2, this->type(), output);
-  }
-
-  // optional .bgs.protocol.report.v2.UserSource source = 3;
-  if (has_source()) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      3, this->source(), output);
-  }
-
-  // optional .bgs.protocol.report.v2.ReportItem item = 4;
-  if (has_item()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->item(), output);
-  }
-
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-  // @@protoc_insertion_point(serialize_end:bgs.protocol.report.v2.UserOptions)
-}
-
-::google::protobuf::uint8* UserOptions::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.report.v2.UserOptions)
-  // optional .bgs.protocol.account.v1.AccountId target_id = 1;
-  if (has_target_id()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        1, this->target_id(), target);
-  }
-
-  // optional .bgs.protocol.report.v2.IssueType type = 2;
-  if (has_type()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      2, this->type(), target);
-  }
-
-  // optional .bgs.protocol.report.v2.UserSource source = 3;
-  if (has_source()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      3, this->source(), target);
-  }
-
-  // optional .bgs.protocol.report.v2.ReportItem item = 4;
-  if (has_item()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        4, this->item(), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.report.v2.UserOptions)
-  return target;
-}
-
-int UserOptions::ByteSize() const {
-  int total_size = 0;
-
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional .bgs.protocol.account.v1.AccountId target_id = 1;
-    if (has_target_id()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->target_id());
-    }
-
-    // optional .bgs.protocol.report.v2.IssueType type = 2;
-    if (has_type()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->type());
-    }
-
-    // optional .bgs.protocol.report.v2.UserSource source = 3;
-    if (has_source()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->source());
-    }
-
-    // optional .bgs.protocol.report.v2.ReportItem item = 4;
-    if (has_item()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->item());
-    }
-
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void UserOptions::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const UserOptions* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const UserOptions*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void UserOptions::MergeFrom(const UserOptions& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_target_id()) {
-      mutable_target_id()->::bgs::protocol::account::v1::AccountId::MergeFrom(from.target_id());
-    }
-    if (from.has_type()) {
-      set_type(from.type());
-    }
-    if (from.has_source()) {
-      set_source(from.source());
-    }
-    if (from.has_item()) {
-      mutable_item()->::bgs::protocol::report::v2::ReportItem::MergeFrom(from.item());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void UserOptions::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void UserOptions::CopyFrom(const UserOptions& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool UserOptions::IsInitialized() const {
-  if (has_target_id()) {
-    if (!this->target_id().IsInitialized()) return false;
-  }
-  return true;
-}
-
 void UserOptions::Swap(UserOptions* other) {
   if (other != this) {
-    std::swap(target_id_, other->target_id_);
-    std::swap(type_, other->type_);
-    std::swap(source_, other->source_);
-    std::swap(item_, other->item_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
+    GetReflection()->Swap(this, other);}
 }
 
 ::google::protobuf::Metadata UserOptions::GetMetadata() const {
@@ -970,333 +516,9 @@ ClubOptions* ClubOptions::New() const {
   return new ClubOptions;
 }
 
-void ClubOptions::Clear() {
-#define OFFSET_OF_FIELD_(f) (reinterpret_cast<char*>(      \
-  &reinterpret_cast<ClubOptions*>(16)->f) - \
-   reinterpret_cast<char*>(16))
-
-#define ZR_(first, last) do {                              \
-    size_t f = OFFSET_OF_FIELD_(first);                    \
-    size_t n = OFFSET_OF_FIELD_(last) - f + sizeof(last);  \
-    ::memset(&first, 0, n);                                \
-  } while (0)
-
-  if (_has_bits_[0 / 32] & 31) {
-    ZR_(club_id_, source_);
-    if (has_item()) {
-      if (item_ != NULL) item_->::bgs::protocol::report::v2::ReportItem::Clear();
-    }
-  }
-
-#undef OFFSET_OF_FIELD_
-#undef ZR_
-
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool ClubOptions::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:bgs.protocol.report.v2.ClubOptions)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional uint64 club_id = 1;
-      case 1: {
-        if (tag == 8) {
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
-                 input, &club_id_)));
-          set_has_club_id();
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(16)) goto parse_stream_id;
-        break;
-      }
-
-      // optional uint64 stream_id = 2;
-      case 2: {
-        if (tag == 16) {
-         parse_stream_id:
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   ::google::protobuf::uint64, ::google::protobuf::internal::WireFormatLite::TYPE_UINT64>(
-                 input, &stream_id_)));
-          set_has_stream_id();
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(24)) goto parse_type;
-        break;
-      }
-
-      // optional .bgs.protocol.report.v2.IssueType type = 3;
-      case 3: {
-        if (tag == 24) {
-         parse_type:
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (::bgs::protocol::report::v2::IssueType_IsValid(value)) {
-            set_type(static_cast< ::bgs::protocol::report::v2::IssueType >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(3, value);
-          }
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(32)) goto parse_source;
-        break;
-      }
-
-      // optional .bgs.protocol.report.v2.ClubSource source = 4;
-      case 4: {
-        if (tag == 32) {
-         parse_source:
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (::bgs::protocol::report::v2::ClubSource_IsValid(value)) {
-            set_source(static_cast< ::bgs::protocol::report::v2::ClubSource >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(4, value);
-          }
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(42)) goto parse_item;
-        break;
-      }
-
-      // optional .bgs.protocol.report.v2.ReportItem item = 5;
-      case 5: {
-        if (tag == 42) {
-         parse_item:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-               input, mutable_item()));
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectAtEnd()) goto success;
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0 ||
-            ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:bgs.protocol.report.v2.ClubOptions)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:bgs.protocol.report.v2.ClubOptions)
-  return false;
-#undef DO_
-}
-
-void ClubOptions::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:bgs.protocol.report.v2.ClubOptions)
-  // optional uint64 club_id = 1;
-  if (has_club_id()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt64(1, this->club_id(), output);
-  }
-
-  // optional uint64 stream_id = 2;
-  if (has_stream_id()) {
-    ::google::protobuf::internal::WireFormatLite::WriteUInt64(2, this->stream_id(), output);
-  }
-
-  // optional .bgs.protocol.report.v2.IssueType type = 3;
-  if (has_type()) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      3, this->type(), output);
-  }
-
-  // optional .bgs.protocol.report.v2.ClubSource source = 4;
-  if (has_source()) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      4, this->source(), output);
-  }
-
-  // optional .bgs.protocol.report.v2.ReportItem item = 5;
-  if (has_item()) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->item(), output);
-  }
-
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-  // @@protoc_insertion_point(serialize_end:bgs.protocol.report.v2.ClubOptions)
-}
-
-::google::protobuf::uint8* ClubOptions::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.report.v2.ClubOptions)
-  // optional uint64 club_id = 1;
-  if (has_club_id()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(1, this->club_id(), target);
-  }
-
-  // optional uint64 stream_id = 2;
-  if (has_stream_id()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteUInt64ToArray(2, this->stream_id(), target);
-  }
-
-  // optional .bgs.protocol.report.v2.IssueType type = 3;
-  if (has_type()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      3, this->type(), target);
-  }
-
-  // optional .bgs.protocol.report.v2.ClubSource source = 4;
-  if (has_source()) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      4, this->source(), target);
-  }
-
-  // optional .bgs.protocol.report.v2.ReportItem item = 5;
-  if (has_item()) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        5, this->item(), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.report.v2.ClubOptions)
-  return target;
-}
-
-int ClubOptions::ByteSize() const {
-  int total_size = 0;
-
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional uint64 club_id = 1;
-    if (has_club_id()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt64Size(
-          this->club_id());
-    }
-
-    // optional uint64 stream_id = 2;
-    if (has_stream_id()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::UInt64Size(
-          this->stream_id());
-    }
-
-    // optional .bgs.protocol.report.v2.IssueType type = 3;
-    if (has_type()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->type());
-    }
-
-    // optional .bgs.protocol.report.v2.ClubSource source = 4;
-    if (has_source()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::EnumSize(this->source());
-    }
-
-    // optional .bgs.protocol.report.v2.ReportItem item = 5;
-    if (has_item()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-          this->item());
-    }
-
-  }
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void ClubOptions::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const ClubOptions* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const ClubOptions*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void ClubOptions::MergeFrom(const ClubOptions& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_club_id()) {
-      set_club_id(from.club_id());
-    }
-    if (from.has_stream_id()) {
-      set_stream_id(from.stream_id());
-    }
-    if (from.has_type()) {
-      set_type(from.type());
-    }
-    if (from.has_source()) {
-      set_source(from.source());
-    }
-    if (from.has_item()) {
-      mutable_item()->::bgs::protocol::report::v2::ReportItem::MergeFrom(from.item());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void ClubOptions::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void ClubOptions::CopyFrom(const ClubOptions& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool ClubOptions::IsInitialized() const {
-  return true;
-}
-
 void ClubOptions::Swap(ClubOptions* other) {
   if (other != this) {
-    std::swap(club_id_, other->club_id_);
-    std::swap(stream_id_, other->stream_id_);
-    std::swap(type_, other->type_);
-    std::swap(source_, other->source_);
-    std::swap(item_, other->item_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
+    GetReflection()->Swap(this, other);}
 }
 
 ::google::protobuf::Metadata ClubOptions::GetMetadata() const {
@@ -1376,268 +598,9 @@ EntityOptions* EntityOptions::New() const {
   return new EntityOptions;
 }
 
-void EntityOptions::Clear() {
-  if (_has_bits_[0 / 32] & 3) {
-    if (has_entity_id()) {
-      if (entity_id_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-        entity_id_->clear();
-      }
-    }
-    if (has_entity_type()) {
-      if (entity_type_ != &::google::protobuf::internal::GetEmptyStringAlreadyInited()) {
-        entity_type_->clear();
-      }
-    }
-  }
-  attribute_.Clear();
-  ::memset(_has_bits_, 0, sizeof(_has_bits_));
-  mutable_unknown_fields()->Clear();
-}
-
-bool EntityOptions::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:bgs.protocol.report.v2.EntityOptions)
-  for (;;) {
-    ::std::pair< ::google::protobuf::uint32, bool> p = input->ReadTagWithCutoff(127);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // optional string entity_id = 1;
-      case 1: {
-        if (tag == 10) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_entity_id()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-            this->entity_id().data(), this->entity_id().length(),
-            ::google::protobuf::internal::WireFormat::PARSE,
-            "entity_id");
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(18)) goto parse_entity_type;
-        break;
-      }
-
-      // optional string entity_type = 2;
-      case 2: {
-        if (tag == 18) {
-         parse_entity_type:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadString(
-                input, this->mutable_entity_type()));
-          ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-            this->entity_type().data(), this->entity_type().length(),
-            ::google::protobuf::internal::WireFormat::PARSE,
-            "entity_type");
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(42)) goto parse_attribute;
-        break;
-      }
-
-      // repeated .bgs.protocol.v2.Attribute attribute = 5;
-      case 5: {
-        if (tag == 42) {
-         parse_attribute:
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessageNoVirtual(
-                input, add_attribute()));
-        } else {
-          goto handle_unusual;
-        }
-        if (input->ExpectTag(42)) goto parse_attribute;
-        if (input->ExpectAtEnd()) goto success;
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0 ||
-            ::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) ==
-            ::google::protobuf::internal::WireFormatLite::WIRETYPE_END_GROUP) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:bgs.protocol.report.v2.EntityOptions)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:bgs.protocol.report.v2.EntityOptions)
-  return false;
-#undef DO_
-}
-
-void EntityOptions::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:bgs.protocol.report.v2.EntityOptions)
-  // optional string entity_id = 1;
-  if (has_entity_id()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->entity_id().data(), this->entity_id().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "entity_id");
-    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
-      1, this->entity_id(), output);
-  }
-
-  // optional string entity_type = 2;
-  if (has_entity_type()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->entity_type().data(), this->entity_type().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "entity_type");
-    ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
-      2, this->entity_type(), output);
-  }
-
-  // repeated .bgs.protocol.v2.Attribute attribute = 5;
-  for (int i = 0; i < this->attribute_size(); i++) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->attribute(i), output);
-  }
-
-  if (!unknown_fields().empty()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        unknown_fields(), output);
-  }
-  // @@protoc_insertion_point(serialize_end:bgs.protocol.report.v2.EntityOptions)
-}
-
-::google::protobuf::uint8* EntityOptions::SerializeWithCachedSizesToArray(
-    ::google::protobuf::uint8* target) const {
-  // @@protoc_insertion_point(serialize_to_array_start:bgs.protocol.report.v2.EntityOptions)
-  // optional string entity_id = 1;
-  if (has_entity_id()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->entity_id().data(), this->entity_id().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "entity_id");
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        1, this->entity_id(), target);
-  }
-
-  // optional string entity_type = 2;
-  if (has_entity_type()) {
-    ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
-      this->entity_type().data(), this->entity_type().length(),
-      ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "entity_type");
-    target =
-      ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
-        2, this->entity_type(), target);
-  }
-
-  // repeated .bgs.protocol.v2.Attribute attribute = 5;
-  for (int i = 0; i < this->attribute_size(); i++) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      WriteMessageNoVirtualToArray(
-        5, this->attribute(i), target);
-  }
-
-  if (!unknown_fields().empty()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        unknown_fields(), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:bgs.protocol.report.v2.EntityOptions)
-  return target;
-}
-
-int EntityOptions::ByteSize() const {
-  int total_size = 0;
-
-  if (_has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    // optional string entity_id = 1;
-    if (has_entity_id()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->entity_id());
-    }
-
-    // optional string entity_type = 2;
-    if (has_entity_type()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::StringSize(
-          this->entity_type());
-    }
-
-  }
-  // repeated .bgs.protocol.v2.Attribute attribute = 5;
-  total_size += 1 * this->attribute_size();
-  for (int i = 0; i < this->attribute_size(); i++) {
-    total_size +=
-      ::google::protobuf::internal::WireFormatLite::MessageSizeNoVirtual(
-        this->attribute(i));
-  }
-
-  if (!unknown_fields().empty()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        unknown_fields());
-  }
-  GOOGLE_SAFE_CONCURRENT_WRITES_BEGIN();
-  _cached_size_ = total_size;
-  GOOGLE_SAFE_CONCURRENT_WRITES_END();
-  return total_size;
-}
-
-void EntityOptions::MergeFrom(const ::google::protobuf::Message& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  const EntityOptions* source =
-    ::google::protobuf::internal::dynamic_cast_if_available<const EntityOptions*>(
-      &from);
-  if (source == NULL) {
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-    MergeFrom(*source);
-  }
-}
-
-void EntityOptions::MergeFrom(const EntityOptions& from) {
-  GOOGLE_CHECK_NE(&from, this);
-  attribute_.MergeFrom(from.attribute_);
-  if (from._has_bits_[0 / 32] & (0xffu << (0 % 32))) {
-    if (from.has_entity_id()) {
-      set_entity_id(from.entity_id());
-    }
-    if (from.has_entity_type()) {
-      set_entity_type(from.entity_type());
-    }
-  }
-  mutable_unknown_fields()->MergeFrom(from.unknown_fields());
-}
-
-void EntityOptions::CopyFrom(const ::google::protobuf::Message& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void EntityOptions::CopyFrom(const EntityOptions& from) {
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool EntityOptions::IsInitialized() const {
-  return true;
-}
-
 void EntityOptions::Swap(EntityOptions* other) {
   if (other != this) {
-    std::swap(entity_id_, other->entity_id_);
-    std::swap(entity_type_, other->entity_type_);
-    attribute_.Swap(&other->attribute_);
-    std::swap(_has_bits_[0], other->_has_bits_[0]);
-    _unknown_fields_.Swap(&other->_unknown_fields_);
-    std::swap(_cached_size_, other->_cached_size_);
-  }
+    GetReflection()->Swap(this, other);}
 }
 
 ::google::protobuf::Metadata EntityOptions::GetMetadata() const {
diff --git a/src/server/proto/Client/api/client/v2/report_types.pb.h b/src/server/proto/Client/api/client/v2/report_types.pb.h
index 03026823d7e..77dac294ebc 100644
--- a/src/server/proto/Client/api/client/v2/report_types.pb.h
+++ b/src/server/proto/Client/api/client/v2/report_types.pb.h
@@ -149,19 +149,6 @@ class TC_PROTO_API ReportItem : public ::google::protobuf::Message {
   // implements Message ----------------------------------------------
 
   ReportItem* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const ReportItem& from);
-  void MergeFrom(const ReportItem& from);
-  void Clear();
-  bool IsInitialized() const;
-
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
@@ -238,19 +225,6 @@ class TC_PROTO_API UserOptions : public ::google::protobuf::Message {
   // implements Message ----------------------------------------------
 
   UserOptions* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const UserOptions& from);
-  void MergeFrom(const UserOptions& from);
-  void Clear();
-  bool IsInitialized() const;
-
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
@@ -351,19 +325,6 @@ class TC_PROTO_API ClubOptions : public ::google::protobuf::Message {
   // implements Message ----------------------------------------------
 
   ClubOptions* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const ClubOptions& from);
-  void MergeFrom(const ClubOptions& from);
-  void Clear();
-  bool IsInitialized() const;
-
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();
@@ -472,19 +433,6 @@ class TC_PROTO_API EntityOptions : public ::google::protobuf::Message {
   // implements Message ----------------------------------------------
 
   EntityOptions* New() const;
-  void CopyFrom(const ::google::protobuf::Message& from);
-  void MergeFrom(const ::google::protobuf::Message& from);
-  void CopyFrom(const EntityOptions& from);
-  void MergeFrom(const EntityOptions& from);
-  void Clear();
-  bool IsInitialized() const;
-
-  int ByteSize() const;
-  bool MergePartialFromCodedStream(
-      ::google::protobuf::io::CodedInputStream* input);
-  void SerializeWithCachedSizes(
-      ::google::protobuf::io::CodedOutputStream* output) const;
-  ::google::protobuf::uint8* SerializeWithCachedSizesToArray(::google::protobuf::uint8* output) const;
   int GetCachedSize() const { return _cached_size_; }
   private:
   void SharedCtor();